Update libhidltransport dump.

For pthread access after destruction.

Bug: 129726097
Test: dump validity tested on builds
Test: boot w/ AOSP device using vendor blobs (for abi stability sanity)
Change-Id: I47e54e15546583b354f133b31e72f9d2dc6fad0d
diff --git a/Q/32/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
index 714c818..cba3630 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-549",
+   "referenced_type" : "type-146",
+   "self_type" : "type-546",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-714",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-841",
+   "referenced_type" : "type-25",
+   "self_type" : "type-850",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-364",
+   "referenced_type" : "type-103",
+   "self_type" : "type-371",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-562",
+   "referenced_type" : "type-103",
+   "self_type" : "type-559",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-814",
+   "self_type" : "type-826",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -70,8 +79,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -80,24 +89,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -114,16 +123,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -159,8 +168,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1797,10 +1806,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1809,10 +1814,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1849,10 +1850,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1865,14 +1862,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2717,8 +2706,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2735,8 +2724,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2753,8 +2742,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2779,8 +2768,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2809,8 +2798,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2831,8 +2820,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2885,8 +2874,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2939,8 +2928,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2965,8 +2954,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2983,8 +2972,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 4,
    "source_file" : "/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-2",
@@ -3009,11 +2998,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3059,8 +3048,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3113,8 +3102,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3139,8 +3128,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3181,8 +3170,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3423,8 +3412,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3453,8 +3442,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3483,8 +3472,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3525,8 +3514,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3563,8 +3552,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3589,8 +3578,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-797",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3607,8 +3596,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3637,8 +3626,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3731,8 +3720,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3773,8 +3762,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-798",
+   "self_type" : "type-798",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3791,8 +3780,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3821,8 +3810,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3855,8 +3844,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3909,8 +3898,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3926,12 +3915,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     }
    ],
-   "referenced_type" : "type-850",
+   "referenced_type" : "type-859",
    "return_type" : "type-2",
-   "self_type" : "type-850",
+   "self_type" : "type-859",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3944,10 +3933,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1012"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3957,10 +3946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3970,16 +3959,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3989,13 +3978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1139"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4005,13 +3994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1140"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4021,13 +4010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4037,13 +4026,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4053,13 +4042,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4069,10 +4058,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4082,10 +4071,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4095,10 +4084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4108,16 +4097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4126,14 +4115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4144,13 +4133,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-1132"
+     "referenced_type" : "type-1145"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4160,13 +4149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4176,13 +4165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4191,16 +4180,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1148"
     }
    ],
    "return_type" : "type-2",
@@ -4213,16 +4202,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
      "default_arg" : true,
@@ -4230,7 +4219,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1149"
     }
    ],
    "return_type" : "type-2",
@@ -4242,16 +4231,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1150"
     }
    ],
    "return_type" : "type-2",
@@ -4265,13 +4254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1151"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4280,16 +4269,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1152"
     }
    ],
    "return_type" : "type-2",
@@ -4301,16 +4290,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1140"
+     "referenced_type" : "type-1153"
     }
    ],
    "return_type" : "type-2",
@@ -4322,16 +4311,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1154"
     }
    ],
    "return_type" : "type-2",
@@ -4343,16 +4332,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1155"
     }
    ],
    "return_type" : "type-2",
@@ -4364,16 +4353,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1156"
     }
    ],
    "return_type" : "type-2",
@@ -4387,10 +4376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4400,13 +4389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4416,19 +4405,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4438,13 +4427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4454,19 +4443,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4476,10 +4465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4489,10 +4478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4502,10 +4491,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4514,13 +4503,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4529,19 +4518,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4551,16 +4540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4570,13 +4559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1157"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4586,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1158"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4602,13 +4591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4618,13 +4607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1159"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4633,16 +4622,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1147"
+     "referenced_type" : "type-1160"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,16 +4640,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1148"
+     "referenced_type" : "type-1161"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4670,13 +4659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1162"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4685,16 +4674,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1150"
+     "referenced_type" : "type-1163"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4704,10 +4693,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4717,10 +4706,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4729,16 +4718,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1151"
+     "referenced_type" : "type-1164"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4747,13 +4736,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4762,13 +4751,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4778,10 +4767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4791,16 +4780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4810,13 +4799,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4826,13 +4815,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4842,14 +4831,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4859,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4878,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1165"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4894,13 +4883,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1153"
+     "referenced_type" : "type-1166"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4910,14 +4899,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4927,13 +4916,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4943,13 +4932,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1167"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4959,11 +4948,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     }
    ],
    "return_type" : "type-2",
@@ -4976,13 +4965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1168"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4992,10 +4981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5005,10 +4994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5017,13 +5006,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5033,10 +5022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5046,16 +5035,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5064,14 +5053,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5080,14 +5069,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5098,13 +5087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5114,13 +5103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5130,13 +5119,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5145,16 +5134,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1177"
     }
    ],
    "return_type" : "type-2",
@@ -5167,16 +5156,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "default_arg" : true,
@@ -5184,7 +5173,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-1178"
     }
    ],
    "return_type" : "type-2",
@@ -5198,13 +5187,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5213,16 +5202,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1180"
     }
    ],
    "return_type" : "type-2",
@@ -5234,16 +5223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1181"
     }
    ],
    "return_type" : "type-2",
@@ -5255,16 +5244,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1182"
     }
    ],
    "return_type" : "type-2",
@@ -5276,16 +5265,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1183"
     }
    ],
    "return_type" : "type-2",
@@ -5297,16 +5286,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1171"
+     "referenced_type" : "type-1184"
     }
    ],
    "return_type" : "type-2",
@@ -5320,10 +5309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5332,16 +5321,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1172"
+     "referenced_type" : "type-1185"
     }
    ],
    "return_type" : "type-2",
@@ -5353,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1173"
+     "referenced_type" : "type-1186"
     }
    ],
    "return_type" : "type-2",
@@ -5375,13 +5364,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5391,13 +5380,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5407,10 +5396,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5420,10 +5409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5433,10 +5422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5445,16 +5434,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1187"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5464,16 +5453,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5483,13 +5472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1188"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,13 +5488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5515,16 +5504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5534,13 +5523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5550,13 +5539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1190"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5565,16 +5554,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1178"
+     "referenced_type" : "type-1191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5584,16 +5573,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1179"
+     "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5602,19 +5591,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5624,13 +5613,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5639,19 +5628,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-1194"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,10 +5650,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5674,10 +5663,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5687,19 +5676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5709,16 +5698,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5727,22 +5716,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5751,19 +5740,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5773,16 +5762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5792,16 +5781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5811,13 +5800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-1195"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5827,10 +5816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5840,16 +5829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5858,19 +5847,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5879,19 +5868,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5901,13 +5890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1196"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5917,13 +5906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5933,13 +5922,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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,14 +5938,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5966,16 +5955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5985,13 +5974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6001,13 +5990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6017,14 +6006,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -6034,13 +6023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6050,13 +6039,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6066,11 +6055,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     }
    ],
    "return_type" : "type-2",
@@ -6083,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1187"
+     "referenced_type" : "type-1200"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6099,10 +6088,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6112,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6124,13 +6113,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6140,10 +6129,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6153,16 +6142,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6171,14 +6160,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6187,14 +6176,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6205,13 +6194,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-1190"
+     "referenced_type" : "type-1203"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6221,13 +6210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6237,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6252,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "referenced_type" : "type-11"
@@ -6273,10 +6262,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
      "referenced_type" : "type-11"
@@ -6295,16 +6284,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
      "default_arg" : true,
@@ -6312,7 +6301,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1193"
+     "referenced_type" : "type-1206"
     }
    ],
    "return_type" : "type-2",
@@ -6326,13 +6315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6341,16 +6330,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1208"
     }
    ],
    "return_type" : "type-2",
@@ -6364,10 +6353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6377,13 +6366,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6393,13 +6382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6409,10 +6398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6422,10 +6411,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6435,10 +6424,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6448,16 +6437,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6467,13 +6456,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6483,13 +6472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6499,13 +6488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6515,13 +6504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6531,19 +6520,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,13 +6542,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6568,22 +6557,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-468"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6593,10 +6582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6606,10 +6595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6619,10 +6608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6632,16 +6621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6651,13 +6640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6667,13 +6656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6683,14 +6672,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6700,16 +6689,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6719,13 +6708,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6735,13 +6724,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6751,14 +6740,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6768,13 +6757,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6784,13 +6773,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6800,11 +6789,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-2",
@@ -6817,13 +6806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6833,10 +6822,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6846,10 +6835,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6858,13 +6847,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6874,10 +6863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6887,16 +6876,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,14 +6894,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6921,14 +6910,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6937,14 +6926,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6955,13 +6944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1206"
+     "referenced_type" : "type-1219"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6971,13 +6960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6987,13 +6976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7003,16 +6992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
      "default_arg" : true,
@@ -7020,7 +7009,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1212"
+     "referenced_type" : "type-1225"
     }
    ],
    "return_type" : "type-2",
@@ -7034,13 +7023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1213"
+     "referenced_type" : "type-1226"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7049,16 +7038,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
-     "referenced_type" : "type-1214"
+     "referenced_type" : "type-1227"
     }
    ],
    "return_type" : "type-2",
@@ -7072,10 +7061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7085,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7101,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7117,10 +7106,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7130,10 +7119,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7143,10 +7132,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7156,16 +7145,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7175,13 +7164,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1215"
+     "referenced_type" : "type-1228"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7191,13 +7180,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1216"
+     "referenced_type" : "type-1229"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7207,16 +7196,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7226,13 +7215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7242,13 +7231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1217"
+     "referenced_type" : "type-1230"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7258,16 +7247,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-1231"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7277,13 +7266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1232"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7293,10 +7282,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7306,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7319,19 +7308,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7341,16 +7330,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7360,19 +7349,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7381,22 +7370,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-549"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7406,16 +7395,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7425,16 +7414,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7444,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1233"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7460,10 +7449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7473,16 +7462,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7492,13 +7481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1234"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7508,13 +7497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7524,13 +7513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7540,14 +7529,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7557,16 +7546,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7576,13 +7565,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1235"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7592,13 +7581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1236"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7608,14 +7597,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7625,13 +7614,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7641,13 +7630,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1237"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7657,11 +7646,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     }
    ],
    "return_type" : "type-2",
@@ -7674,13 +7663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1238"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7690,10 +7679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7703,10 +7692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7715,13 +7704,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7731,10 +7720,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7744,16 +7733,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7762,14 +7751,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7778,14 +7767,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7795,14 +7784,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7812,16 +7801,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7831,13 +7820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1226"
+     "referenced_type" : "type-1239"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7847,13 +7836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1240"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7863,14 +7852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7880,13 +7869,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7896,13 +7885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1241"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7912,11 +7901,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     }
    ],
    "return_type" : "type-2",
@@ -7929,13 +7918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1229"
+     "referenced_type" : "type-1242"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7945,10 +7934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7958,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7970,13 +7959,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7986,10 +7975,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7999,16 +7988,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8017,14 +8006,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8033,14 +8022,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8049,14 +8038,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8065,14 +8054,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8083,13 +8072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-1245"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8099,13 +8088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8115,13 +8104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8132,13 +8121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8148,13 +8137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8164,13 +8153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8180,16 +8169,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
      "default_arg" : true,
@@ -8197,7 +8186,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-1257"
     }
    ],
    "return_type" : "type-2",
@@ -8211,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8226,16 +8215,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-1259"
     }
    ],
    "return_type" : "type-2",
@@ -8249,10 +8238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8262,13 +8251,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8278,13 +8267,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8294,10 +8283,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8307,10 +8296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8320,10 +8309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8333,16 +8322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
      "default_arg" : true,
@@ -8350,7 +8339,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1260"
     }
    ],
    "return_type" : "type-2",
@@ -8364,13 +8353,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1261"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8379,16 +8368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1262"
     }
    ],
    "return_type" : "type-2",
@@ -8400,16 +8389,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1263"
     }
    ],
    "return_type" : "type-2",
@@ -8421,16 +8410,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1251"
+     "referenced_type" : "type-1264"
     }
    ],
    "return_type" : "type-2",
@@ -8442,16 +8431,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1265"
     }
    ],
    "return_type" : "type-2",
@@ -8463,16 +8452,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1253"
+     "referenced_type" : "type-1266"
     }
    ],
    "return_type" : "type-2",
@@ -8486,10 +8475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8499,13 +8488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8515,13 +8504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8531,10 +8520,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8544,10 +8533,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8557,10 +8546,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8570,16 +8559,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8589,13 +8578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1254"
+     "referenced_type" : "type-1267"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8605,13 +8594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1268"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8621,13 +8610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8637,13 +8626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1269"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8652,19 +8641,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8674,13 +8663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1270"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8690,10 +8679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8703,10 +8692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8716,10 +8705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8729,16 +8718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8748,16 +8737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8767,13 +8756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8783,13 +8772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8799,16 +8788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8818,19 +8807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8840,13 +8829,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1271"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8856,13 +8845,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1272"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8872,16 +8861,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8891,19 +8880,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8913,13 +8902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8929,13 +8918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1273"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8945,16 +8934,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1261"
+     "referenced_type" : "type-1274"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8963,22 +8952,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8987,22 +8976,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9012,13 +9001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1275"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9028,10 +9017,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9041,10 +9030,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9054,22 +9043,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9079,16 +9068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9098,19 +9087,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9120,16 +9109,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9139,16 +9128,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9158,19 +9147,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9179,25 +9168,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9206,19 +9195,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1277"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9227,19 +9216,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9249,16 +9238,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9268,16 +9257,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9287,13 +9276,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1265"
+     "referenced_type" : "type-1278"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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,10 +9292,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9316,16 +9305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9335,13 +9324,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1279"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9351,13 +9340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9367,13 +9356,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9382,12 +9371,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-299", "type-153" ]
+   "template_args" : [ "type-31", "type-306", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9395,12 +9384,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9408,12 +9397,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9421,12 +9410,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9434,10 +9423,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-396"
     },
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-615"
     }
    ],
    "return_type" : "type-2",
@@ -9449,10 +9438,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-953"
+     "referenced_type" : "type-961"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     }
    ],
    "return_type" : "type-2",
@@ -9464,10 +9453,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
    "return_type" : "type-2",
@@ -9479,10 +9468,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
-   "return_type" : "type-385",
+   "return_type" : "type-378",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9491,13 +9480,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9512,19 +9501,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9533,10 +9522,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9564,14 +9553,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-976"
     }
    ],
    "return_type" : "type-2",
@@ -9584,10 +9573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9597,16 +9586,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9615,7 +9604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "referenced_type" : "type-2"
@@ -9624,7 +9613,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9639,10 +9628,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9660,10 +9649,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9681,10 +9670,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9705,10 +9694,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9717,10 +9706,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9738,10 +9727,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9759,10 +9748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9780,28 +9769,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-768",
+   "return_type" : "type-777",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9811,13 +9800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
      "referenced_type" : "type-604"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9827,10 +9816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     }
    ],
-   "return_type" : "type-279",
+   "return_type" : "type-289",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9840,19 +9829,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9862,19 +9851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9886,22 +9875,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9910,18 +9899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9929,18 +9918,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9948,18 +9937,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9967,18 +9956,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9986,18 +9975,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10005,18 +9994,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10024,18 +10013,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10043,18 +10032,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -10062,10 +10051,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-1281",
+   "return_type" : "type-1294",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10074,12 +10063,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10087,12 +10076,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10100,12 +10089,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10113,17 +10102,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10138,13 +10127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10153,18 +10142,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10172,18 +10161,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10191,18 +10180,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10210,18 +10199,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10229,29 +10218,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10260,19 +10249,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10281,10 +10270,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10293,10 +10282,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10305,10 +10294,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10320,79 +10309,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1297",
+   "referenced_type" : "type-1310",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1298",
+   "referenced_type" : "type-1311",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-633",
+   "referenced_type" : "type-713",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10402,8 +10391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-865",
+   "referenced_type" : "type-865",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10411,8 +10400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-880",
+   "referenced_type" : "type-885",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10420,8 +10409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-493",
-   "self_type" : "type-517",
+   "referenced_type" : "type-489",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10429,17 +10418,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-469",
+   "referenced_type" : "type-472",
    "self_type" : "type-483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-415",
+   "self_type" : "type-1098",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-420",
+   "self_type" : "type-1101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10447,8 +10454,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10456,8 +10463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10465,8 +10472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10474,8 +10481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-616",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10483,8 +10490,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10492,8 +10499,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10501,8 +10508,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-329",
-   "self_type" : "type-333",
+   "referenced_type" : "type-337",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10510,8 +10517,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-470",
-   "self_type" : "type-473",
+   "referenced_type" : "type-476",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10519,8 +10526,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-552",
-   "self_type" : "type-555",
+   "referenced_type" : "type-560",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10528,8 +10535,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-639",
+   "self_type" : "type-642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10537,8 +10544,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-709",
-   "self_type" : "type-713",
+   "referenced_type" : "type-717",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10546,8 +10553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-405",
+   "referenced_type" : "type-151",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10555,8 +10562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-706",
+   "referenced_type" : "type-19",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10573,8 +10580,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-360",
-   "self_type" : "type-445",
+   "referenced_type" : "type-367",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10582,8 +10589,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-353",
-   "self_type" : "type-437",
+   "referenced_type" : "type-359",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10591,8 +10598,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10600,8 +10607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10609,8 +10616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-363",
-   "self_type" : "type-448",
+   "referenced_type" : "type-370",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10618,8 +10625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-318",
-   "self_type" : "type-338",
+   "referenced_type" : "type-310",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10627,8 +10634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-442",
+   "referenced_type" : "type-141",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10636,8 +10643,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-359",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10645,8 +10652,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-352",
-   "self_type" : "type-358",
+   "referenced_type" : "type-358",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10654,8 +10661,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-1029",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10663,8 +10670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10672,8 +10679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10681,8 +10688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-921",
+   "referenced_type" : "type-777",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10690,8 +10697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10699,8 +10706,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-276",
-   "self_type" : "type-325",
+   "referenced_type" : "type-286",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10708,8 +10715,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-85",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10717,8 +10724,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-181",
-   "self_type" : "type-317",
+   "referenced_type" : "type-188",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10726,8 +10733,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-61",
-   "self_type" : "type-320",
+   "referenced_type" : "type-68",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10735,8 +10742,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10744,8 +10751,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-70",
-   "self_type" : "type-624",
+   "referenced_type" : "type-75",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10753,8 +10760,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10762,8 +10769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-638",
-   "self_type" : "type-904",
+   "referenced_type" : "type-633",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10771,8 +10778,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-282",
-   "self_type" : "type-888",
+   "referenced_type" : "type-292",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10780,8 +10787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
+   "referenced_type" : "type-504",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10789,8 +10796,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-479",
+   "referenced_type" : "type-474",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10798,8 +10805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10807,8 +10814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10816,8 +10823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10825,8 +10832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "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"
   },
@@ -10834,8 +10841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1925",
    "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"
   },
@@ -10843,8 +10850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1977",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1999",
    "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"
   },
@@ -10852,8 +10859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2059",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10861,8 +10868,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "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"
   },
@@ -10870,8 +10877,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-389",
-   "self_type" : "type-391",
+   "referenced_type" : "type-397",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10879,8 +10886,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-520",
+   "referenced_type" : "type-523",
+   "self_type" : "type-525",
    "size" : 4,
    "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"
   },
@@ -10888,8 +10895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-596",
+   "referenced_type" : "type-599",
+   "self_type" : "type-601",
    "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"
   },
@@ -10897,8 +10904,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-612",
+   "referenced_type" : "type-608",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10906,8 +10913,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-674",
-   "self_type" : "type-676",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "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"
   },
@@ -10915,8 +10922,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-738",
+   "referenced_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10924,8 +10931,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-820",
+   "referenced_type" : "type-827",
+   "self_type" : "type-829",
    "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"
   },
@@ -10933,8 +10940,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10942,8 +10949,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10951,8 +10958,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-953",
+   "referenced_type" : "type-90",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10960,8 +10967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-403",
-   "self_type" : "type-402",
+   "referenced_type" : "type-412",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10969,8 +10976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10978,8 +10985,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
+   "referenced_type" : "type-424",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10988,7 +10995,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
    "referenced_type" : "type-328",
-   "self_type" : "type-330",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10996,8 +11003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-313",
+   "referenced_type" : "type-298",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11005,8 +11012,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-806",
-   "self_type" : "type-823",
+   "referenced_type" : "type-814",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11014,8 +11021,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-395",
-   "self_type" : "type-394",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11023,8 +11030,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-373",
-   "self_type" : "type-396",
+   "referenced_type" : "type-381",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11032,8 +11039,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-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11041,8 +11048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-952",
-   "self_type" : "type-956",
+   "referenced_type" : "type-963",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11050,8 +11057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-406",
+   "referenced_type" : "type-389",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11059,8 +11066,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-684",
-   "self_type" : "type-687",
+   "referenced_type" : "type-675",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11068,8 +11075,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-372",
-   "self_type" : "type-443",
+   "referenced_type" : "type-380",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11077,8 +11084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11086,8 +11093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11095,8 +11102,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-275",
-   "self_type" : "type-289",
+   "referenced_type" : "type-285",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11104,8 +11111,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-895",
-   "self_type" : "type-898",
+   "referenced_type" : "type-905",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11113,8 +11120,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-775",
-   "self_type" : "type-887",
+   "referenced_type" : "type-784",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11122,8 +11129,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11131,8 +11138,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11140,8 +11147,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11149,8 +11156,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11158,8 +11165,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11167,8 +11174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-902",
-   "self_type" : "type-903",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11176,8 +11183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11185,8 +11192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11194,7 +11201,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-602",
+   "referenced_type" : "type-597",
    "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
@@ -11203,8 +11210,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-893",
-   "self_type" : "type-894",
+   "referenced_type" : "type-903",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11212,8 +11219,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-889",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-898",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11221,8 +11228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11230,8 +11237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11239,8 +11246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11248,254 +11255,254 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1023",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1035",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1443",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1490",
+   "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-1505",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1528",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1557",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1587",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1639",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1678",
    "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-1749",
+   "self_type" : "type-1751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "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-1879",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1899",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2047",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2149",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2210",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-368",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-348",
-   "self_type" : "type-350",
+   "self_type" : "type-353",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-487",
+   "referenced_type" : "type-354",
+   "self_type" : "type-356",
    "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",
+   "referenced_type" : "type-493",
+   "self_type" : "type-495",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-647",
+   "referenced_type" : "type-574",
+   "self_type" : "type-576",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-798",
+   "referenced_type" : "type-732",
+   "self_type" : "type-734",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-860",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-949",
-   "self_type" : "type-951",
+   "referenced_type" : "type-867",
+   "self_type" : "type-869",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-958",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11503,7 +11510,7 @@
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
    "referenced_type" : "type-566",
-   "self_type" : "type-576",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11511,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11520,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11529,8 +11536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11538,8 +11545,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-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11547,8 +11554,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11556,8 +11563,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-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11565,8 +11572,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-1513",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11574,8 +11581,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-1547",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11583,8 +11590,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-155",
-   "self_type" : "type-157",
+   "referenced_type" : "type-162",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11592,8 +11599,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-1627",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11602,7 +11609,7 @@
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-1747",
-   "self_type" : "type-1751",
+   "self_type" : "type-1761",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11610,8 +11617,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-1760",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11619,8 +11626,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-1828",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11628,8 +11635,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-1889",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11637,8 +11644,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-1960",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11646,8 +11653,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-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11655,8 +11662,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-2084",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2106",
    "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"
   },
@@ -11664,8 +11671,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-2138",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11673,8 +11680,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-2206",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11682,8 +11689,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-399",
-   "self_type" : "type-401",
+   "referenced_type" : "type-407",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11691,8 +11698,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-499",
-   "self_type" : "type-501",
+   "referenced_type" : "type-505",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11700,8 +11707,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-580",
-   "self_type" : "type-582",
+   "referenced_type" : "type-584",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11709,8 +11716,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-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-662",
+   "self_type" : "type-664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11718,8 +11725,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-707",
-   "self_type" : "type-710",
+   "referenced_type" : "type-710",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11727,8 +11734,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-741",
-   "self_type" : "type-744",
+   "referenced_type" : "type-750",
+   "self_type" : "type-752",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11736,8 +11743,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-815",
-   "self_type" : "type-817",
+   "referenced_type" : "type-822",
+   "self_type" : "type-824",
    "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"
   },
@@ -11745,8 +11752,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-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-973",
+   "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11754,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11763,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11772,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11781,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11790,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11799,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11808,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11817,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11826,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11835,8 +11842,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-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11844,8 +11851,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-1090",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11853,8 +11860,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-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11862,8 +11869,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-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11871,8 +11878,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-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11880,8 +11887,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-1472",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11889,8 +11896,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-1522",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11898,8 +11905,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-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11907,8 +11914,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-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11916,8 +11923,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-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11925,8 +11932,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-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11934,8 +11941,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-1668",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11943,8 +11950,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-1678",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11952,8 +11959,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-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1688",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11961,8 +11968,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-1847",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11970,8 +11977,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-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11979,8 +11986,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-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11988,8 +11995,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-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11997,8 +12004,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-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12006,8 +12013,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-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12015,8 +12022,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12024,8 +12031,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-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12033,8 +12040,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "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-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12051,8 +12067,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-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12060,8 +12076,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12069,8 +12085,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12078,8 +12094,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-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12087,8 +12103,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-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12096,8 +12112,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12105,8 +12121,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-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12114,8 +12130,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-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12123,8 +12139,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-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12132,17 +12148,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-870",
-   "self_type" : "type-869",
-   "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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12150,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12159,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12168,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12177,8 +12184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12187,7 +12194,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-466",
+   "self_type" : "type-461",
    "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"
   },
@@ -12195,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-979",
+   "referenced_type" : "type-103",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -12207,8 +12214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-875",
+   "referenced_type" : "type-876",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -12216,8 +12223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-861",
+   "referenced_type" : "type-865",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12225,8 +12232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-864",
-   "self_type" : "type-866",
+   "referenced_type" : "type-873",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12234,8 +12241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-878",
+   "referenced_type" : "type-885",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12243,8 +12250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-879",
-   "self_type" : "type-881",
+   "referenced_type" : "type-888",
+   "self_type" : "type-890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12252,8 +12259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-883",
+   "referenced_type" : "type-893",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12261,8 +12268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12270,8 +12277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12279,8 +12286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12288,8 +12295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12297,8 +12304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12306,8 +12313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12315,8 +12322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12324,339 +12331,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2021",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/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-946",
-   "self_type" : "type-945",
-   "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-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ScopedTrace *",
-   "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Trace.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-897",
-   "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-1315",
-   "self_type" : "type-1314",
-   "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-1440",
    "self_type" : "type-1439",
    "size" : 4,
@@ -12664,35 +12338,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "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-1600",
-   "self_type" : "type-1599",
-   "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-1671",
-   "self_type" : "type-1670",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1673",
    "self_type" : "type-1672",
    "size" : 4,
@@ -12700,100 +12401,262 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1742",
    "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-1800",
-   "self_type" : "type-1799",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
    "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-1855",
-   "self_type" : "type-1854",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "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-1916",
-   "self_type" : "type-1915",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "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-1995",
-   "self_type" : "type-1994",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "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",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "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-260",
-   "self_type" : "type-259",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
    "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-291",
-   "self_type" : "type-290",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "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-455",
-   "self_type" : "type-454",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "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-534",
-   "self_type" : "type-533",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-487",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/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-646",
+   "self_type" : "type-645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-730",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "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-282",
+   "self_type" : "type-281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-472",
+   "self_type" : "type-484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-728",
+   "self_type" : "type-900",
+   "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-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12801,8 +12664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12810,8 +12673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12819,8 +12682,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "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-1682",
+   "self_type" : "type-1681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12828,8 +12700,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
+   "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-1707",
+   "self_type" : "type-1706",
+   "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-1821",
+   "self_type" : "type-1820",
+   "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-1875",
+   "self_type" : "type-1874",
+   "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-1937",
+   "self_type" : "type-1936",
+   "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-2015",
+   "self_type" : "type-2014",
+   "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-2081",
+   "self_type" : "type-2080",
+   "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-269",
+   "self_type" : "type-268",
+   "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-297",
+   "self_type" : "type-296",
+   "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-460",
+   "self_type" : "type-459",
+   "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-540",
+   "self_type" : "type-539",
+   "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-614",
+   "self_type" : "type-613",
+   "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-635",
+   "self_type" : "type-634",
+   "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-65",
+   "self_type" : "type-64",
+   "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-698",
+   "self_type" : "type-697",
+   "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,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12837,8 +12844,8 @@
    "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-408",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-415",
+   "self_type" : "type-1092",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12846,8 +12853,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-413",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-420",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12855,8 +12862,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-633",
-   "self_type" : "type-667",
+   "referenced_type" : "type-628",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12864,8 +12871,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-245",
-   "self_type" : "type-423",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12873,8 +12880,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-239",
-   "self_type" : "type-417",
+   "referenced_type" : "type-246",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12891,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12900,8 +12907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12909,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12918,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12927,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12936,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12945,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12963,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12972,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12981,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12990,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12999,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13008,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13017,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13026,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13035,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13044,8 +13051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13053,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13062,17 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
-   "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-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13089,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13098,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13107,8 +13105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13116,8 +13114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13125,8 +13123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13134,8 +13132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13143,8 +13141,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
+   "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-704",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13161,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13170,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-996",
-   "self_type" : "type-995",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13179,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13188,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13197,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13206,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13215,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13224,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13233,8 +13240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13242,8 +13249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13251,8 +13258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13260,8 +13267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13269,8 +13276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13278,8 +13285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13287,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13296,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13305,8 +13312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13314,8 +13321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13323,8 +13330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13332,8 +13339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13341,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13350,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13359,8 +13366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13368,8 +13375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13377,8 +13384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-700",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13386,8 +13393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13395,8 +13402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-963",
+   "referenced_type" : "type-970",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13404,8 +13411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13413,8 +13420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13422,8 +13429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1779",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13431,8 +13438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "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"
   },
@@ -13440,8 +13447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "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"
   },
@@ -13449,8 +13456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "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"
   },
@@ -13458,8 +13465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13467,8 +13474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "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"
   },
@@ -13476,8 +13483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13485,8 +13492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "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"
   },
@@ -13494,8 +13501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-603",
+   "self_type" : "type-602",
    "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"
   },
@@ -13503,8 +13510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-612",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13512,8 +13519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "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"
   },
@@ -13521,8 +13528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-739",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13530,8 +13537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
+   "referenced_type" : "type-831",
+   "self_type" : "type-830",
    "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"
   },
@@ -13539,8 +13546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13548,8 +13555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13557,8 +13564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13566,8 +13573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13575,8 +13582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13584,8 +13591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13593,8 +13600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13602,8 +13609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13611,8 +13618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13620,8 +13627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13629,8 +13636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13638,8 +13645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13647,8 +13654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13656,8 +13663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13665,8 +13672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +13681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13683,8 +13690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13692,8 +13699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-627",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13701,8 +13708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13710,8 +13717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13719,8 +13726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13728,8 +13735,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13737,8 +13744,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13746,8 +13753,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-329",
-   "self_type" : "type-331",
+   "referenced_type" : "type-337",
+   "self_type" : "type-338",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13755,8 +13762,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-470",
-   "self_type" : "type-471",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13764,8 +13771,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-552",
-   "self_type" : "type-553",
+   "referenced_type" : "type-560",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13773,8 +13780,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-625",
-   "self_type" : "type-628",
+   "referenced_type" : "type-639",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13782,8 +13789,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-709",
-   "self_type" : "type-711",
+   "referenced_type" : "type-717",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13791,8 +13798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-297",
+   "referenced_type" : "type-151",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13800,8 +13807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-657",
+   "referenced_type" : "type-19",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13810,7 +13817,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-940",
+   "self_type" : "type-950",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +13825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13827,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13836,16 +13843,61 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-1097",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1100",
+   "self_type" : "type-1102",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-713",
+   "self_type" : "type-715",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1060",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-721",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
+   "referenced_type" : "type-56",
    "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -13854,8 +13906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13863,8 +13915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13872,8 +13924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-72",
+   "self_type" : "type-71",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13881,8 +13933,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-360",
-   "self_type" : "type-444",
+   "referenced_type" : "type-367",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13890,8 +13942,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-353",
-   "self_type" : "type-436",
+   "referenced_type" : "type-359",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13899,8 +13951,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-131",
-   "self_type" : "type-159",
+   "referenced_type" : "type-137",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +13960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13917,7 +13969,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
+   "referenced_type" : "type-20",
    "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -13926,8 +13978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-370",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13935,8 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13944,8 +13996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13953,8 +14005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-322",
+   "referenced_type" : "type-310",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13962,8 +14014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-355",
+   "referenced_type" : "type-141",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13971,8 +14023,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-359",
-   "self_type" : "type-365",
+   "referenced_type" : "type-366",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13980,8 +14032,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-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-358",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13989,8 +14041,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-130",
-   "self_type" : "type-142",
+   "referenced_type" : "type-136",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13998,8 +14050,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-1029",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14007,8 +14059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14016,8 +14068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14025,8 +14077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-536",
+   "referenced_type" : "type-160",
+   "self_type" : "type-534",
    "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"
   },
@@ -14034,8 +14086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14043,8 +14095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14052,8 +14104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14061,8 +14113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
    "size" : 4,
    "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"
   },
@@ -14070,8 +14122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "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"
   },
@@ -14079,8 +14131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-296",
+   "referenced_type" : "type-192",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14088,8 +14140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-319",
+   "referenced_type" : "type-181",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14097,8 +14149,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-299",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14106,8 +14158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-458",
+   "referenced_type" : "type-464",
+   "self_type" : "type-465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14115,8 +14167,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14124,8 +14176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14133,8 +14185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14142,8 +14194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "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"
   },
@@ -14151,8 +14203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-538",
+   "referenced_type" : "type-200",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14160,8 +14212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-537",
+   "referenced_type" : "type-542",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14169,8 +14221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14178,8 +14230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
    "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"
   },
@@ -14187,8 +14239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
    "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"
   },
@@ -14196,8 +14248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-611",
+   "referenced_type" : "type-209",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14205,8 +14257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14214,8 +14266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-610",
+   "referenced_type" : "type-617",
+   "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14223,8 +14275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14232,8 +14284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14241,8 +14293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14250,8 +14302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-905",
-   "self_type" : "type-938",
+   "referenced_type" : "type-915",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14259,8 +14311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-305",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14268,8 +14320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-917",
+   "referenced_type" : "type-777",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14277,8 +14329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14286,8 +14338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-932",
+   "referenced_type" : "type-937",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14295,8 +14347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14304,357 +14356,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-276",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-638",
-   "self_type" : "type-901",
-   "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-268",
-   "self_type" : "type-274",
-   "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-279",
-   "self_type" : "type-892",
-   "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-282",
-   "self_type" : "type-886",
-   "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-831",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "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-477",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-407",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-412",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1044",
-   "self_type" : "type-1046",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-704",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1493",
-   "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-2011",
-   "self_type" : "type-2015",
-   "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-924",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-334",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-556",
-   "self_type" : "type-557",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-631",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1325",
-   "self_type" : "type-1327",
-   "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-1607",
-   "self_type" : "type-1609",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -14662,10 +14363,361 @@
   },
   {
    "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-286",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-1007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-1014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-1010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-1016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-1012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-910",
+   "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-278",
+   "self_type" : "type-284",
+   "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-289",
+   "self_type" : "type-902",
+   "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-292",
+   "self_type" : "type-892",
+   "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-840",
+   "self_type" : "type-846",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-504",
+   "self_type" : "type-508",
+   "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-474",
+   "self_type" : "type-475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-414",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-419",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-673",
+   "self_type" : "type-674",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1054",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-701",
+   "self_type" : "type-702",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1512",
+   "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-2031",
+   "self_type" : "type-2033",
+   "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-934",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-341",
+   "self_type" : "type-342",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-480",
+   "self_type" : "type-481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-564",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-643",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-722",
+   "self_type" : "type-723",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-344",
+   "self_type" : "type-953",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1345",
+   "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-1628",
+   "self_type" : "type-1630",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-446",
-   "self_type" : "type-447",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14673,8 +14725,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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14682,8 +14734,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14691,8 +14743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-969",
+   "referenced_type" : "type-132",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14700,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-558",
+   "referenced_type" : "type-531",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14709,8 +14761,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-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14718,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-914",
+   "referenced_type" : "type-923",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14728,7 +14780,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
    "referenced_type" : "type-328",
-   "self_type" : "type-341",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14736,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14745,8 +14797,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-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-814",
+   "self_type" : "type-815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14754,8 +14806,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-395",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-403",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14763,8 +14815,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-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14772,8 +14824,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-1034",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14781,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-955",
+   "referenced_type" : "type-963",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,7 +14842,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-389",
    "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -14799,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-727",
-   "self_type" : "type-731",
+   "referenced_type" : "type-739",
+   "self_type" : "type-742",
    "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"
   },
@@ -14808,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-632",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14817,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -14826,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -14835,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-977",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14844,8 +14896,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-372",
-   "self_type" : "type-371",
+   "referenced_type" : "type-380",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14853,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-970",
-   "self_type" : "type-972",
+   "referenced_type" : "type-980",
+   "self_type" : "type-981",
    "size" : 4,
    "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"
   },
@@ -14862,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -14871,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
+   "referenced_type" : "type-995",
+   "self_type" : "type-996",
    "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"
   },
@@ -14880,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -14889,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -14898,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "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"
   },
@@ -14907,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-988",
-   "self_type" : "type-989",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "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"
   },
@@ -14916,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
+   "referenced_type" : "type-931",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14925,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-934",
+   "referenced_type" : "type-942",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14934,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14943,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14952,8 +15004,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-275",
-   "self_type" : "type-326",
+   "referenced_type" : "type-285",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14961,8 +15013,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-895",
-   "self_type" : "type-912",
+   "referenced_type" : "type-905",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,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-775",
-   "self_type" : "type-916",
+   "referenced_type" : "type-784",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14979,8 +15031,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-223",
-   "self_type" : "type-999",
+   "referenced_type" : "type-230",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14988,8 +15040,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-60",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14997,8 +15049,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-30",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-37",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15006,8 +15058,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-69",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-74",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15015,8 +15067,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-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-48",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15024,8 +15076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-902",
-   "self_type" : "type-907",
+   "referenced_type" : "type-912",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15033,8 +15085,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-893",
-   "self_type" : "type-899",
+   "referenced_type" : "type-903",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15042,8 +15094,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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-898",
+   "self_type" : "type-899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15051,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15060,8 +15112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-491",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15069,8 +15121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-370",
+   "referenced_type" : "type-158",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15079,7 +15131,7 @@
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
    "referenced_type" : "type-566",
-   "self_type" : "type-575",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15087,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15096,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-381",
+   "referenced_type" : "type-122",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15105,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-426",
+   "referenced_type" : "type-399",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15114,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-850",
-   "self_type" : "type-851",
+   "referenced_type" : "type-859",
+   "self_type" : "type-860",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -15124,7 +15176,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15132,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-560",
-   "self_type" : "type-579",
+   "referenced_type" : "type-557",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15142,7 +15194,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15150,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-832",
+   "referenced_type" : "type-103",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -15160,7 +15212,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-393",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15168,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-735",
+   "referenced_type" : "type-22",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15177,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-735",
-   "self_type" : "type-852",
+   "referenced_type" : "type-746",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -15190,8 +15242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15200,8 +15252,8 @@
    "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",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15210,8 +15262,8 @@
    "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",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15220,8 +15272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15230,8 +15282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15240,8 +15292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15250,8 +15302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15260,8 +15312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15270,8 +15322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15280,8 +15332,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15290,8 +15342,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15300,8 +15352,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15310,8 +15362,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15320,8 +15372,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15330,8 +15382,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15340,8 +15392,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15350,8 +15402,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15360,8 +15412,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15370,8 +15422,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15380,8 +15432,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15390,8 +15442,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15400,8 +15452,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15410,8 +15462,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15420,8 +15472,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15430,8 +15482,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15440,8 +15492,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15450,8 +15502,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15460,8 +15512,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-342",
-   "self_type" : "type-345",
+   "referenced_type" : "type-350",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15470,8 +15522,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15480,8 +15532,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",
+   "referenced_type" : "type-569",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15490,8 +15542,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15500,8 +15552,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-729",
+   "self_type" : "type-731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15510,8 +15562,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
+   "referenced_type" : "type-799",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15520,8 +15572,8 @@
    "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",
+   "referenced_type" : "type-861",
+   "self_type" : "type-864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15530,8 +15582,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-954",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15540,8 +15592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -15550,8 +15602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15560,8 +15612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-493",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15570,8 +15622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-469",
-   "self_type" : "type-477",
+   "referenced_type" : "type-472",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15580,8 +15632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-734",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15590,8 +15642,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-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-415",
+   "self_type" : "type-414",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15600,8 +15652,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-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-420",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15610,8 +15662,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-633",
-   "self_type" : "type-679",
+   "referenced_type" : "type-628",
+   "self_type" : "type-673",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15620,8 +15672,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-245",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1054",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15630,8 +15682,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<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-239",
-   "self_type" : "type-704",
+   "referenced_type" : "type-246",
+   "self_type" : "type-701",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15640,8 +15692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15650,8 +15702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15660,8 +15712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15670,8 +15722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15680,8 +15732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15690,8 +15742,8 @@
    "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-1774",
+   "self_type" : "type-1773",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15700,8 +15752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "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"
   },
@@ -15710,8 +15762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "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"
   },
@@ -15720,8 +15772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "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"
   },
@@ -15730,8 +15782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15740,8 +15792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "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"
   },
@@ -15750,8 +15802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "type-398",
+   "self_type" : "type-397",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15760,8 +15812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-524",
+   "self_type" : "type-523",
    "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"
   },
@@ -15770,8 +15822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "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"
   },
@@ -15780,8 +15832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15790,8 +15842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
    "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"
   },
@@ -15800,8 +15852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-744",
+   "self_type" : "type-743",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15810,8 +15862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-819",
-   "self_type" : "type-818",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "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"
   },
@@ -15820,8 +15872,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15830,8 +15882,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15840,8 +15892,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-329",
-   "self_type" : "type-334",
+   "referenced_type" : "type-337",
+   "self_type" : "type-341",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15850,8 +15902,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-470",
-   "self_type" : "type-474",
+   "referenced_type" : "type-476",
+   "self_type" : "type-480",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15860,8 +15912,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-552",
-   "self_type" : "type-556",
+   "referenced_type" : "type-560",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15870,8 +15922,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-625",
-   "self_type" : "type-631",
+   "referenced_type" : "type-639",
+   "self_type" : "type-643",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15880,8 +15932,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-709",
-   "self_type" : "type-714",
+   "referenced_type" : "type-717",
+   "self_type" : "type-722",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15890,8 +15942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-337",
+   "referenced_type" : "type-151",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15900,8 +15952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15911,7 +15963,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15920,8 +15972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-413",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15930,8 +15982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15950,8 +16002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15960,8 +16012,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-360",
-   "self_type" : "type-446",
+   "referenced_type" : "type-367",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15970,8 +16022,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-353",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-359",
+   "self_type" : "type-1064",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15980,8 +16032,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15990,8 +16042,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-532",
+   "referenced_type" : "type-20",
+   "self_type" : "type-531",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16010,8 +16062,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-363",
-   "self_type" : "type-805",
+   "referenced_type" : "type-370",
+   "self_type" : "type-813",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16020,8 +16072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-913",
+   "referenced_type" : "type-291",
+   "self_type" : "type-923",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16030,8 +16082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-427",
+   "referenced_type" : "type-273",
+   "self_type" : "type-424",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16040,7 +16092,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
+   "referenced_type" : "type-310",
    "self_type" : "type-328",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16050,8 +16102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-306",
+   "referenced_type" : "type-141",
+   "self_type" : "type-298",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16060,8 +16112,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-359",
-   "self_type" : "type-806",
+   "referenced_type" : "type-366",
+   "self_type" : "type-814",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16070,8 +16122,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-352",
-   "self_type" : "type-395",
+   "referenced_type" : "type-358",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16080,8 +16132,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-130",
-   "self_type" : "type-373",
+   "referenced_type" : "type-136",
+   "self_type" : "type-381",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16090,8 +16142,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-1029",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16100,8 +16152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-952",
+   "referenced_type" : "type-127",
+   "self_type" : "type-963",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16110,8 +16162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-388",
+   "referenced_type" : "type-372",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16120,8 +16172,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-299",
-   "self_type" : "type-727",
+   "referenced_type" : "type-306",
+   "self_type" : "type-739",
    "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"
   },
@@ -16130,8 +16182,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-141",
-   "self_type" : "type-459",
+   "referenced_type" : "type-147",
+   "self_type" : "type-458",
    "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"
   },
@@ -16140,8 +16192,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-24",
-   "self_type" : "type-637",
+   "referenced_type" : "type-31",
+   "self_type" : "type-632",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16150,8 +16202,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-636",
-   "self_type" : "type-684",
+   "referenced_type" : "type-631",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16160,8 +16212,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -16170,8 +16222,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -16180,8 +16232,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-23",
-   "self_type" : "type-976",
+   "referenced_type" : "type-30",
+   "self_type" : "type-985",
    "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"
   },
@@ -16190,8 +16242,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-134",
-   "self_type" : "type-372",
+   "referenced_type" : "type-140",
+   "self_type" : "type-380",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16200,8 +16252,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-975",
-   "self_type" : "type-980",
+   "referenced_type" : "type-984",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16210,8 +16262,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-96",
-   "self_type" : "type-978",
+   "referenced_type" : "type-102",
+   "self_type" : "type-987",
    "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"
   },
@@ -16220,8 +16272,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-63",
-   "self_type" : "type-970",
+   "referenced_type" : "type-70",
+   "self_type" : "type-980",
    "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"
   },
@@ -16230,8 +16282,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -16240,8 +16292,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-22",
-   "self_type" : "type-985",
+   "referenced_type" : "type-29",
+   "self_type" : "type-995",
    "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"
   },
@@ -16250,8 +16302,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -16260,8 +16312,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -16270,8 +16322,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-72",
-   "self_type" : "type-973",
+   "referenced_type" : "type-77",
+   "self_type" : "type-982",
    "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"
   },
@@ -16280,8 +16332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-988",
+   "referenced_type" : "type-51",
+   "self_type" : "type-997",
    "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"
   },
@@ -16290,8 +16342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-922",
+   "referenced_type" : "type-777",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16300,8 +16352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16310,8 +16362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-933",
+   "referenced_type" : "type-937",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16320,8 +16372,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-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16330,8 +16382,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16340,8 +16392,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16350,8 +16402,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-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16360,8 +16412,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-85",
-   "self_type" : "type-775",
+   "referenced_type" : "type-94",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16422,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16380,8 +16432,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16390,8 +16442,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16400,8 +16452,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16410,8 +16462,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16420,8 +16472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-902",
+   "referenced_type" : "type-633",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16429,24 +16481,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
    "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-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "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-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-598",
+   "self_type" : "type-597",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -16454,8 +16506,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-279",
-   "self_type" : "type-893",
+   "referenced_type" : "type-289",
+   "self_type" : "type-903",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16464,8 +16516,8 @@
    "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-282",
-   "self_type" : "type-889",
+   "referenced_type" : "type-292",
+   "self_type" : "type-898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16474,8 +16526,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16494,8 +16546,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16504,8 +16556,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16514,8 +16566,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16525,7 +16577,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16533,216 +16585,208 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "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-1506",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1637",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "source_file" : "/system/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-1750",
+   "self_type" : "type-1749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "source_file" : "/system/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-1898",
+   "self_type" : "type-1897",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16757,56 +16801,64 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "type-355",
+   "self_type" : "type-354",
    "source_file" : "/system/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",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16814,7 +16866,7 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-560",
+   "referenced_type" : "type-557",
    "self_type" : "type-566",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -16824,8 +16876,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16835,7 +16887,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-288",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16896,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16854,8 +16906,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16864,8 +16916,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-1039",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -16874,348 +16926,348 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1074",
-   "size" : 12,
-   "source_file" : "/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-1114",
-   "self_type" : "type-1113",
-   "size" : 12,
-   "source_file" : "/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-1364",
-   "self_type" : "type-1363",
-   "size" : 12,
-   "source_file" : "/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-1427",
-   "self_type" : "type-1426",
-   "size" : 12,
-   "source_file" : "/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-1454",
-   "self_type" : "type-1453",
-   "size" : 12,
-   "source_file" : "/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-147",
-   "self_type" : "type-146",
-   "size" : 12,
-   "source_file" : "/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-1511",
-   "self_type" : "type-1510",
-   "size" : 12,
-   "source_file" : "/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-1536",
-   "self_type" : "type-1535",
-   "size" : 12,
-   "source_file" : "/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-1541",
-   "self_type" : "type-1540",
-   "size" : 12,
-   "source_file" : "/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-1569",
-   "self_type" : "type-1568",
-   "size" : 12,
-   "source_file" : "/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-1593",
-   "self_type" : "type-1592",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-1661",
-   "self_type" : "type-1660",
-   "size" : 12,
-   "source_file" : "/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-1750",
-   "self_type" : "type-1749",
-   "size" : 12,
-   "source_file" : "/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-1827",
-   "self_type" : "type-1826",
-   "size" : 12,
-   "source_file" : "/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-1886",
-   "self_type" : "type-1885",
-   "size" : 12,
-   "source_file" : "/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-1958",
-   "self_type" : "type-1957",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-2083",
-   "self_type" : "type-2082",
-   "size" : 12,
-   "source_file" : "/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-2116",
-   "self_type" : "type-2115",
-   "size" : 12,
-   "source_file" : "/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-2136",
-   "self_type" : "type-2135",
-   "size" : 12,
-   "source_file" : "/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-2200",
-   "self_type" : "type-2199",
-   "size" : 12,
-   "source_file" : "/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-2224",
-   "self_type" : "type-2223",
-   "size" : 12,
-   "source_file" : "/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-2248",
-   "self_type" : "type-2247",
-   "size" : 12,
-   "source_file" : "/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-237",
-   "self_type" : "type-236",
-   "size" : 12,
-   "source_file" : "/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-387",
-   "self_type" : "type-386",
-   "size" : 12,
-   "source_file" : "/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-468",
-   "self_type" : "type-467",
-   "size" : 12,
-   "source_file" : "/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-498",
-   "self_type" : "type-497",
-   "size" : 12,
-   "source_file" : "/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-578",
-   "self_type" : "type-577",
-   "size" : 12,
-   "source_file" : "/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-653",
-   "self_type" : "type-652",
-   "size" : 12,
-   "source_file" : "/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-733",
-   "self_type" : "type-732",
-   "size" : 12,
-   "source_file" : "/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-811",
-   "self_type" : "type-810",
-   "size" : 12,
-   "source_file" : "/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-863",
-   "self_type" : "type-862",
-   "size" : 12,
-   "source_file" : "/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-959",
-   "self_type" : "type-958",
-   "size" : 12,
-   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "referenced_type" : "type-1088",
    "self_type" : "type-1087",
+   "size" : 12,
+   "source_file" : "/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-1315",
+   "self_type" : "type-1314",
+   "size" : 12,
+   "source_file" : "/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-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"
+  },
+  {
+   "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-1445",
+   "self_type" : "type-1444",
+   "size" : 12,
+   "source_file" : "/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-1474",
+   "self_type" : "type-1473",
+   "size" : 12,
+   "source_file" : "/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-14",
+   "self_type" : "type-13",
+   "size" : 12,
+   "source_file" : "/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-1531",
+   "self_type" : "type-1530",
+   "size" : 12,
+   "source_file" : "/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-154",
+   "self_type" : "type-153",
+   "size" : 12,
+   "source_file" : "/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-1551",
+   "self_type" : "type-1550",
+   "size" : 12,
+   "source_file" : "/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-1563",
+   "self_type" : "type-1562",
+   "size" : 12,
+   "source_file" : "/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-1590",
+   "self_type" : "type-1589",
+   "size" : 12,
+   "source_file" : "/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-1612",
+   "self_type" : "type-1611",
+   "size" : 12,
+   "source_file" : "/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-1645",
+   "self_type" : "type-1644",
+   "size" : 12,
+   "source_file" : "/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-1680",
+   "self_type" : "type-1679",
+   "size" : 12,
+   "source_file" : "/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-1771",
+   "self_type" : "type-1770",
+   "size" : 12,
+   "source_file" : "/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-1847",
+   "self_type" : "type-1846",
+   "size" : 12,
+   "source_file" : "/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-1906",
+   "self_type" : "type-1905",
+   "size" : 12,
+   "source_file" : "/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-1978",
+   "self_type" : "type-1977",
+   "size" : 12,
+   "source_file" : "/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-2055",
+   "self_type" : "type-2054",
+   "size" : 12,
+   "source_file" : "/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-2103",
+   "self_type" : "type-2102",
+   "size" : 12,
+   "source_file" : "/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-2137",
+   "self_type" : "type-2136",
+   "size" : 12,
+   "source_file" : "/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-2156",
+   "self_type" : "type-2155",
+   "size" : 12,
+   "source_file" : "/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-2220",
+   "self_type" : "type-2219",
+   "size" : 12,
+   "source_file" : "/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-2246",
+   "self_type" : "type-2245",
+   "size" : 12,
+   "source_file" : "/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-242",
+   "self_type" : "type-241",
+   "size" : 12,
+   "source_file" : "/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-394",
+   "self_type" : "type-393",
+   "size" : 12,
+   "source_file" : "/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-463",
+   "self_type" : "type-462",
+   "size" : 12,
+   "source_file" : "/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-501",
+   "self_type" : "type-500",
+   "size" : 12,
+   "source_file" : "/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-583",
+   "self_type" : "type-582",
+   "size" : 12,
+   "source_file" : "/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-741",
+   "self_type" : "type-740",
+   "size" : 12,
+   "source_file" : "/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-819",
+   "self_type" : "type-818",
+   "size" : 12,
+   "source_file" : "/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-872",
+   "self_type" : "type-871",
+   "size" : 12,
+   "source_file" : "/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-969",
+   "self_type" : "type-968",
+   "size" : 12,
+   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17224,8 +17276,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-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17234,8 +17286,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-1434",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17244,8 +17296,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-1520",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17254,8 +17306,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-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17264,8 +17316,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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17274,8 +17326,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-1666",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17284,8 +17336,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17294,8 +17346,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-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17304,8 +17356,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-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17314,8 +17366,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-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17324,8 +17376,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-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17334,8 +17386,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-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17344,8 +17396,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-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17354,8 +17406,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-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17364,8 +17416,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-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17374,8 +17426,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17384,8 +17436,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-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17394,8 +17446,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-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17404,8 +17456,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-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17414,8 +17466,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-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17424,8 +17476,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-758",
-   "self_type" : "type-757",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17434,8 +17486,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-839",
-   "self_type" : "type-838",
+   "referenced_type" : "type-848",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17444,8 +17496,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-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17454,8 +17506,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "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"
   },
@@ -17464,8 +17516,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1397",
    "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"
   },
@@ -17474,8 +17526,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-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "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"
   },
@@ -17484,8 +17536,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-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
    "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"
   },
@@ -17494,8 +17546,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-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "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"
   },
@@ -17504,8 +17556,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-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
    "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"
   },
@@ -17514,8 +17566,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-1664",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
    "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"
   },
@@ -17524,8 +17576,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -17534,8 +17586,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-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "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"
   },
@@ -17544,8 +17596,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-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "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"
   },
@@ -17554,8 +17606,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-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "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"
   },
@@ -17564,8 +17616,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-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "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"
   },
@@ -17574,8 +17626,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-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "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"
   },
@@ -17584,8 +17636,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-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "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"
   },
@@ -17594,8 +17646,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
    "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"
   },
@@ -17604,8 +17656,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-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "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"
   },
@@ -17614,8 +17666,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -17624,8 +17676,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-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-440",
+   "self_type" : "type-439",
    "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"
   },
@@ -17634,8 +17686,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-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "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"
   },
@@ -17644,8 +17696,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-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "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"
   },
@@ -17654,8 +17706,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-669",
-   "self_type" : "type-668",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "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"
   },
@@ -17664,8 +17716,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-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "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"
   },
@@ -17674,8 +17726,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-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "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"
   },
@@ -17684,8 +17736,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-982",
-   "self_type" : "type-981",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "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"
   },
@@ -17694,8 +17746,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-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1056",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17704,8 +17756,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17714,8 +17766,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-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17724,8 +17776,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-1514",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1532",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17734,8 +17786,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-1548",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17744,8 +17796,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-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17754,8 +17806,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-1628",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17774,8 +17826,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-1761",
-   "self_type" : "type-1760",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17784,8 +17836,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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17794,8 +17846,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-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17804,8 +17856,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-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17814,8 +17866,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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17824,8 +17876,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-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 12,
    "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"
   },
@@ -17834,8 +17886,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-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17844,8 +17896,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-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2226",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17854,8 +17906,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-400",
-   "self_type" : "type-399",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17864,8 +17916,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-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17874,8 +17926,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-581",
-   "self_type" : "type-580",
+   "referenced_type" : "type-585",
+   "self_type" : "type-584",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17884,8 +17936,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-655",
-   "self_type" : "type-654",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17894,8 +17946,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-708",
-   "self_type" : "type-707",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17904,8 +17956,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-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-751",
+   "self_type" : "type-750",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17914,8 +17966,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-816",
-   "self_type" : "type-815",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "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"
   },
@@ -17924,8 +17976,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-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17934,8 +17986,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17944,8 +17996,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17954,8 +18006,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17964,8 +18016,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1497",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17974,8 +18026,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1734",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17984,8 +18036,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-694",
+   "self_type" : "type-693",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17994,8 +18046,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18004,8 +18056,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18014,8 +18066,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-627",
-   "self_type" : "type-626",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18024,8 +18076,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-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18034,8 +18086,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-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18044,8 +18096,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-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18054,8 +18106,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-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18064,8 +18116,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-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18074,8 +18126,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-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18084,8 +18136,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-367",
-   "self_type" : "type-366",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18094,8 +18146,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-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18104,8 +18156,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-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18114,8 +18166,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-651",
-   "self_type" : "type-650",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18124,8 +18176,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18134,8 +18186,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-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18144,8 +18196,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-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18154,8 +18206,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-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18164,8 +18216,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-1881",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18226,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-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18184,8 +18236,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-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18194,8 +18246,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-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18204,8 +18256,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-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18214,8 +18266,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-489",
-   "self_type" : "type-488",
+   "referenced_type" : "type-497",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18224,8 +18276,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-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18234,8 +18286,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-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18244,8 +18296,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-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18254,8 +18306,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-800",
-   "self_type" : "type-799",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18264,8 +18316,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-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18274,8 +18326,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-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1375",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18284,8 +18336,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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1640",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18294,8 +18346,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-1056",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18304,8 +18356,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18314,8 +18366,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18324,8 +18376,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-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18334,8 +18386,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-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18344,8 +18396,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-1457",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18354,8 +18406,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-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,8 +18416,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-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18374,8 +18426,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-1580",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1573",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18384,8 +18436,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-1597",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18394,8 +18446,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-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18404,8 +18456,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-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18414,8 +18466,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-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18424,8 +18476,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-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18434,8 +18486,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-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18444,8 +18496,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-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18454,8 +18506,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-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18464,8 +18516,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-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18474,8 +18526,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-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18484,8 +18536,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-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18494,8 +18546,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18504,8 +18556,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-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18514,8 +18566,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-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
+   "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-221",
+   "self_type" : "type-220",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18534,8 +18596,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18544,8 +18606,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-267",
+   "self_type" : "type-266",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18554,8 +18616,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-451",
-   "self_type" : "type-450",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18564,8 +18626,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-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18574,8 +18636,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-601",
-   "self_type" : "type-600",
+   "referenced_type" : "type-607",
+   "self_type" : "type-606",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18584,8 +18646,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18594,8 +18656,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-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18604,8 +18666,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-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18614,8 +18676,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18624,18 +18686,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-871",
-   "self_type" : "type-870",
-   "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-992",
-   "self_type" : "type-991",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18644,8 +18696,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18655,7 +18707,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18665,7 +18717,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18674,8 +18726,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18683,8 +18735,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-418",
+   "referenced_type" : "type-22",
+   "self_type" : "type-399",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18692,8 +18744,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-884",
+   "referenced_type" : "type-21",
+   "self_type" : "type-895",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -18707,14 +18759,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-877"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
+   "referenced_type" : "type-876",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -18726,17 +18778,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-753"
+     "referenced_type" : "type-762"
     }
    ],
    "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-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-493", "type-768" ],
+   "template_args" : [ "type-489", "type-777" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -18746,17 +18798,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-441"
+     "referenced_type" : "type-436"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -18766,17 +18818,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-726",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-730" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -18786,14 +18838,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-866"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-865",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -18805,14 +18857,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-874"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-873",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -18822,7 +18874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-435"
     }
    ],
    "fields" :
@@ -18831,20 +18883,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -18856,14 +18908,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -18875,14 +18927,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -18894,14 +18946,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -18914,14 +18966,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -18961,8 +19013,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -18972,8 +19024,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -18983,8 +19035,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -19016,8 +19068,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -19028,17 +19080,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-761"
     }
    ],
    "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-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-754" ],
+   "template_args" : [ "type-763" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -19085,14 +19137,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -19150,14 +19202,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -19169,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -19187,7 +19239,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -19196,25 +19248,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-865"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-876"
     },
     {
      "access" : "private",
@@ -19226,19 +19278,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-945"
     },
     {
      "access" : "private",
@@ -19250,8 +19302,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
+   "referenced_type" : "type-947",
+   "self_type" : "type-947",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -19341,17 +19393,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -19396,17 +19448,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-271" ],
+   "template_args" : [ "type-281" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -19451,17 +19503,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-770",
+   "self_type" : "type-770",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-639" ],
+   "template_args" : [ "type-634" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -19506,17 +19558,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-769" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -19563,7 +19615,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
@@ -19575,20 +19627,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -19640,14 +19692,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-726"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-728",
+   "self_type" : "type-728",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -19677,23 +19729,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-416"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-410"
+     "referenced_type" : "type-417"
     }
    ],
    "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-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-404" ],
+   "template_args" : [ "type-292", "type-413" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -19703,23 +19755,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-422"
     }
    ],
    "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-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-16" ],
+   "template_args" : [ "type-292", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -19729,23 +19781,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-634"
+     "referenced_type" : "type-629"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-630"
     }
    ],
    "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-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-636", "type-638" ],
+   "template_args" : [ "type-631", "type-633" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19755,23 +19807,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19781,23 +19833,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19838,18 +19890,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-310"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19931,14 +19983,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-971"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -19950,13 +20002,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -19973,11 +20025,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19985,7 +20037,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -19994,17 +20046,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -20012,7 +20064,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20021,17 +20073,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -20039,7 +20091,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20048,17 +20100,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -20066,7 +20118,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20075,17 +20127,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -20093,7 +20145,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20102,17 +20154,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -20120,7 +20172,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20129,17 +20181,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-639",
+   "self_type" : "type-639",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -20147,7 +20199,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20156,17 +20208,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -20174,7 +20226,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20183,17 +20235,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20201,17 +20253,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20250,34 +20302,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1097",
+   "self_type" : "type-1097",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-415" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1100",
+   "self_type" : "type-1100",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-420" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-713",
+   "self_type" : "type-713",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-628" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1060",
+   "self_type" : "type-1060",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-721",
+   "self_type" : "type-721",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20316,8 +20468,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20329,14 +20481,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20345,8 +20497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20355,8 +20507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20365,8 +20517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
+   "referenced_type" : "type-920",
+   "self_type" : "type-920",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20402,7 +20554,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -20413,8 +20565,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -20443,16 +20595,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-368"
     }
    ],
    "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-360",
-   "self_type" : "type-360",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20461,16 +20613,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-360"
     }
    ],
    "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-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -20479,16 +20631,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -20497,16 +20649,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20516,7 +20668,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20527,8 +20679,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20539,16 +20691,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20558,7 +20710,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -20569,8 +20721,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -20581,16 +20733,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20600,7 +20752,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -20611,8 +20763,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20624,7 +20776,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-369"
     },
     {
      "field_name" : "_pad",
@@ -20635,8 +20787,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20648,7 +20800,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "_pad",
@@ -20659,8 +20811,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20671,13 +20823,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -20690,7 +20842,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -20701,8 +20853,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20713,13 +20865,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -20732,7 +20884,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -20743,8 +20895,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20753,8 +20905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -20772,14 +20924,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -20788,11 +20940,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-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -20802,16 +20954,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -20819,7 +20971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-293"
     }
    ],
    "fields" :
@@ -20828,7 +20980,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
@@ -20840,13 +20992,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 192,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-292"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -20926,13 +21078,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -21014,19 +21166,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -21038,7 +21190,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -21050,13 +21202,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -21068,7 +21220,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -21080,13 +21232,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -21110,13 +21262,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -21129,7 +21281,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
@@ -21141,16 +21293,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -21160,7 +21312,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -21172,16 +21324,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -21191,7 +21343,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -21203,16 +21355,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -21222,7 +21374,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -21234,16 +21386,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -21251,7 +21403,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1040"
     }
    ],
    "fields" :
@@ -21259,14 +21411,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-1027"
+     "referenced_type" : "type-1037"
     }
    ],
    "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-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -21278,7 +21430,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -21290,13 +21442,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -21309,19 +21461,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -21331,10 +21483,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21343,13 +21495,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -21471,10 +21623,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-309"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21483,19 +21635,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-299",
-   "self_type" : "type-299",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "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",
@@ -21678,10 +21830,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21690,19 +21842,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "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",
@@ -21838,13 +21990,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "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"
@@ -21855,13 +22007,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -21970,7 +22122,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21979,13 +22131,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -22107,7 +22259,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -22116,13 +22268,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -22244,10 +22396,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22256,19 +22408,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -22475,10 +22627,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22487,19 +22639,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -22685,10 +22837,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22697,19 +22849,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "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",
@@ -22858,10 +23010,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22870,19 +23022,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "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",
@@ -23010,13 +23162,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -23158,12 +23310,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -23173,18 +23325,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -23194,13 +23346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -23313,7 +23465,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -23322,13 +23474,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -23450,10 +23602,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23462,19 +23614,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -23684,10 +23836,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23696,19 +23848,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "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",
@@ -23860,13 +24012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -24011,7 +24163,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24020,13 +24172,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -24148,7 +24300,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24157,13 +24309,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -24285,10 +24437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24297,19 +24449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -24495,10 +24647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24507,19 +24659,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -24744,10 +24896,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24756,19 +24908,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "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",
@@ -24896,10 +25048,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24908,19 +25060,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "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",
@@ -25087,13 +25239,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -25206,13 +25358,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -25379,17 +25531,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-937" ],
+   "template_args" : [ "type-947" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -25399,17 +25551,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-906" ],
+   "template_args" : [ "type-916" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -25419,17 +25571,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-304" ],
+   "template_args" : [ "type-312" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -25439,17 +25591,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-778"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-780" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -25459,17 +25611,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-319" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -25479,17 +25631,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -25499,17 +25651,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-937",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-940" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -25519,17 +25671,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1012" ],
+   "template_args" : [ "type-1022" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -25539,157 +25691,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-277"
-    }
-   ],
-   "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-276",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-287"
+    }
+   ],
+   "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-286",
+   "self_type" : "type-286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-288" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-290"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-906",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-291" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -25699,69 +25851,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25771,52 +25923,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1118",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1026",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1062",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25826,8 +25978,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25837,85 +25989,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1036",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-933",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1127",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25925,52 +26077,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1009",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-978",
+   "self_type" : "type-978",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25980,8 +26132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25991,85 +26143,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-952",
+   "self_type" : "type-952",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26079,52 +26231,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1114",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-990",
+   "self_type" : "type-990",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26134,8 +26286,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1121",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26145,107 +26297,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1091",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1032",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-493" ],
+   "template_args" : [ "type-489" ],
    "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-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-469" ],
+   "template_args" : [ "type-472" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26255,52 +26407,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1119",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1086",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1027",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26310,8 +26462,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1123",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26321,33 +26473,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -26357,23 +26509,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-633",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-641" ],
+   "template_args" : [ "type-636" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -26383,23 +26535,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-273" ],
+   "template_args" : [ "type-283" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -26409,23 +26561,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -26435,23 +26587,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "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-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -26460,18 +26612,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-858",
+   "self_type" : "type-858",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -26487,18 +26639,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -26509,7 +26661,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-842"
     },
     {
      "field_name" : "num_planes",
@@ -26519,13 +26671,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-835"
+     "referenced_type" : "type-846"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-845",
+   "self_type" : "type-845",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -26536,12 +26688,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-832"
+     "referenced_type" : "type-841"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-824"
+     "referenced_type" : "type-837"
     },
     {
      "field_name" : "bits_per_component",
@@ -26576,8 +26728,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -26588,38 +26740,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-857",
+   "self_type" : "type-857",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -26630,18 +26782,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -26652,17 +26804,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "ystride",
@@ -26682,13 +26834,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -26698,13 +26850,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -26715,35 +26867,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-554"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-553"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     }
    ],
    "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-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "self_type" : "type-558",
    "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)"
@@ -26764,8 +26916,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -26776,12 +26928,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26806,13 +26958,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -26823,12 +26975,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26858,13 +27010,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -26875,12 +27027,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26910,13 +27062,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -26927,12 +27079,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26967,13 +27119,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-556",
+   "self_type" : "type-556",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -27017,8 +27169,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27026,8 +27178,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27035,8 +27187,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-329",
-   "self_type" : "type-332",
+   "referenced_type" : "type-337",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27044,8 +27196,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-470",
-   "self_type" : "type-472",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27053,8 +27205,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-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-560",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27062,8 +27214,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-625",
-   "self_type" : "type-629",
+   "referenced_type" : "type-639",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27071,8 +27223,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-709",
-   "self_type" : "type-712",
+   "referenced_type" : "type-717",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27080,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-340",
+   "referenced_type" : "type-151",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27089,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-688",
+   "referenced_type" : "type-19",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27099,7 +27251,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-1098",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27107,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-413",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27116,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-506",
+   "referenced_type" : "type-20",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27125,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-284",
-   "self_type" : "type-327",
+   "referenced_type" : "type-273",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27134,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-318",
-   "self_type" : "type-339",
+   "referenced_type" : "type-310",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27143,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27152,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-905",
-   "self_type" : "type-920",
+   "referenced_type" : "type-915",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27161,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-768",
-   "self_type" : "type-918",
+   "referenced_type" : "type-777",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27170,8 +27322,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-276",
-   "self_type" : "type-324",
+   "referenced_type" : "type-286",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27179,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-910",
+   "referenced_type" : "type-906",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27188,8 +27340,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-85",
-   "self_type" : "type-994",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27197,8 +27349,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-181",
-   "self_type" : "type-316",
+   "referenced_type" : "type-188",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27206,8 +27358,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-61",
-   "self_type" : "type-321",
+   "referenced_type" : "type-68",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27215,8 +27367,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27224,8 +27376,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-70",
-   "self_type" : "type-621",
+   "referenced_type" : "type-75",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27233,8 +27385,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27242,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-638",
-   "self_type" : "type-673",
+   "referenced_type" : "type-633",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27251,8 +27403,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-282",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-292",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27260,215 +27412,116 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-636",
-   "self_type" : "type-670",
-   "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-1771",
-   "self_type" : "type-1770",
-   "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-1832",
-   "self_type" : "type-1831",
-   "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-1893",
-   "self_type" : "type-1892",
-   "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-1965",
-   "self_type" : "type-1964",
-   "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-2047",
-   "self_type" : "type-2046",
-   "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-2094",
-   "self_type" : "type-2093",
-   "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-420",
-   "self_type" : "type-419",
-   "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-503",
-   "self_type" : "type-502",
-   "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-585",
-   "self_type" : "type-584",
-   "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-662",
-   "self_type" : "type-661",
-   "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-747",
-   "self_type" : "type-746",
-   "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-826",
-   "self_type" : "type-825",
-   "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-1776",
-   "self_type" : "type-1775",
-   "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-1836",
-   "self_type" : "type-1835",
-   "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-1897",
-   "self_type" : "type-1896",
-   "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-1969",
-   "self_type" : "type-1968",
-   "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-2051",
-   "self_type" : "type-2050",
-   "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-2098",
-   "self_type" : "type-2097",
-   "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-425",
-   "self_type" : "type-424",
-   "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-509",
-   "self_type" : "type-508",
-   "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-589",
-   "self_type" : "type-588",
-   "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-666",
+   "referenced_type" : "type-631",
    "self_type" : "type-665",
    "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-751",
-   "self_type" : "type-750",
+   "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-1791",
+   "self_type" : "type-1790",
+   "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-1852",
+   "self_type" : "type-1851",
+   "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-1913",
+   "self_type" : "type-1912",
+   "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-1985",
+   "self_type" : "type-1984",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-2114",
+   "self_type" : "type-2113",
+   "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-426",
+   "self_type" : "type-425",
+   "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-510",
+   "self_type" : "type-509",
+   "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-588",
+   "self_type" : "type-587",
+   "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-667",
+   "self_type" : "type-666",
+   "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-754",
+   "self_type" : "type-753",
+   "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-834",
+   "self_type" : "type-833",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27476,8 +27529,107 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
+   "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-1856",
+   "self_type" : "type-1855",
+   "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-1917",
+   "self_type" : "type-1916",
+   "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-1989",
+   "self_type" : "type-1988",
+   "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-2071",
+   "self_type" : "type-2070",
+   "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-2118",
+   "self_type" : "type-2117",
+   "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-430",
+   "self_type" : "type-429",
+   "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-515",
+   "self_type" : "type-514",
+   "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-592",
+   "self_type" : "type-591",
+   "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-672",
+   "self_type" : "type-671",
+   "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-759",
+   "self_type" : "type-758",
+   "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-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27485,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27494,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27503,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27512,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27521,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2048",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27530,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27539,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27548,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27557,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27566,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27575,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27584,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/32/x86/source-based/libhidltransport.so.lsdump b/Q/32/x86/source-based/libhidltransport.so.lsdump
index 190a3b0..86475c0 100644
--- a/Q/32/x86/source-based/libhidltransport.so.lsdump
+++ b/Q/32/x86/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-338",
+   "referenced_type" : "type-146",
+   "self_type" : "type-343",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-410",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-455",
+   "referenced_type" : "type-25",
+   "self_type" : "type-466",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-983",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1004",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-345",
+   "referenced_type" : "type-103",
+   "self_type" : "type-350",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-447",
+   "self_type" : "type-458",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -69,8 +78,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -79,24 +88,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -150,8 +159,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -170,8 +179,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 4
   },
   {
@@ -190,15 +199,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1788,10 +1797,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1800,10 +1805,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1840,10 +1841,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1856,14 +1853,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2651,8 +2640,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2669,8 +2658,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2687,8 +2676,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2713,8 +2702,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2743,8 +2732,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2765,8 +2754,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2819,8 +2808,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2862,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2899,8 +2888,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2917,8 +2906,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/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-2",
@@ -2943,11 +2932,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -2993,8 +2982,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3047,8 +3036,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3073,8 +3062,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3115,8 +3104,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3357,8 +3346,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3387,8 +3376,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3417,8 +3406,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3459,8 +3448,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3497,8 +3486,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3523,8 +3512,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3541,8 +3530,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3571,8 +3560,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3665,8 +3654,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-443",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3707,8 +3696,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3725,8 +3714,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3755,8 +3744,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3789,8 +3778,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3843,8 +3832,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3860,12 +3849,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     }
    ],
-   "referenced_type" : "type-459",
+   "referenced_type" : "type-470",
    "return_type" : "type-2",
-   "self_type" : "type-459",
+   "self_type" : "type-470",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3878,10 +3867,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3891,10 +3880,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3904,16 +3893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3923,13 +3912,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1614"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3939,13 +3928,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1615"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3955,13 +3944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3971,13 +3960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1616"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3987,13 +3976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1617"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4003,10 +3992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4016,10 +4005,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4029,10 +4018,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4042,16 +4031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4060,14 +4049,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4078,13 +4067,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1620"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4094,13 +4083,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4110,13 +4099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4125,16 +4114,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1623"
     }
    ],
    "return_type" : "type-2",
@@ -4147,16 +4136,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
      "default_arg" : true,
@@ -4164,7 +4153,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1624"
     }
    ],
    "return_type" : "type-2",
@@ -4176,16 +4165,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1625"
     }
    ],
    "return_type" : "type-2",
@@ -4199,13 +4188,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1626"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4214,16 +4203,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1627"
     }
    ],
    "return_type" : "type-2",
@@ -4235,16 +4224,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1628"
     }
    ],
    "return_type" : "type-2",
@@ -4256,16 +4245,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1629"
     }
    ],
    "return_type" : "type-2",
@@ -4277,16 +4266,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1630"
     }
    ],
    "return_type" : "type-2",
@@ -4298,16 +4287,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1631"
     }
    ],
    "return_type" : "type-2",
@@ -4321,10 +4310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4334,13 +4323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4350,19 +4339,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4372,13 +4361,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4388,19 +4377,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4410,10 +4399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4423,10 +4412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4436,10 +4425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4448,13 +4437,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4463,19 +4452,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4485,16 +4474,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4504,13 +4493,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1632"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4520,13 +4509,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1633"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4536,13 +4525,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4552,13 +4541,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1634"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4567,16 +4556,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1635"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4585,16 +4574,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1636"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4604,13 +4593,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1637"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4619,16 +4608,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1638"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4638,10 +4627,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,10 +4640,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4663,16 +4652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1639"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4681,13 +4670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4696,13 +4685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4712,10 +4701,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4725,16 +4714,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4744,13 +4733,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4760,13 +4749,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4776,14 +4765,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4793,16 +4782,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4812,13 +4801,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1640"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4828,13 +4817,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4844,14 +4833,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4861,13 +4850,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4877,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4893,11 +4882,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     }
    ],
    "return_type" : "type-2",
@@ -4910,13 +4899,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4926,10 +4915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4939,10 +4928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4951,13 +4940,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4967,10 +4956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4980,16 +4969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4998,14 +4987,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5014,14 +5003,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5032,13 +5021,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1646"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5048,13 +5037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5064,13 +5053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5079,16 +5068,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1652"
     }
    ],
    "return_type" : "type-2",
@@ -5101,16 +5090,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "default_arg" : true,
@@ -5118,7 +5107,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1653"
     }
    ],
    "return_type" : "type-2",
@@ -5132,13 +5121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5147,16 +5136,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1655"
     }
    ],
    "return_type" : "type-2",
@@ -5168,16 +5157,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1656"
     }
    ],
    "return_type" : "type-2",
@@ -5189,16 +5178,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1657"
     }
    ],
    "return_type" : "type-2",
@@ -5210,16 +5199,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1635"
+     "referenced_type" : "type-1658"
     }
    ],
    "return_type" : "type-2",
@@ -5231,16 +5220,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-1659"
     }
    ],
    "return_type" : "type-2",
@@ -5254,10 +5243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5266,16 +5255,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1637"
+     "referenced_type" : "type-1660"
     }
    ],
    "return_type" : "type-2",
@@ -5287,16 +5276,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1661"
     }
    ],
    "return_type" : "type-2",
@@ -5309,13 +5298,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5325,13 +5314,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5341,10 +5330,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5354,10 +5343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5367,10 +5356,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5379,16 +5368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1639"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5398,16 +5387,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5417,13 +5406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5433,13 +5422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5449,16 +5438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5468,13 +5457,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5484,13 +5473,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,16 +5488,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5518,16 +5507,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5536,19 +5525,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5558,13 +5547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5573,19 +5562,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5595,10 +5584,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5608,10 +5597,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5621,19 +5610,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5643,16 +5632,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,22 +5650,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5685,19 +5674,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5707,16 +5696,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5726,16 +5715,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5745,13 +5734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5761,10 +5750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5774,16 +5763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5792,19 +5781,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5813,19 +5802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5835,13 +5824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5851,13 +5840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5867,13 +5856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5883,14 +5872,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5900,16 +5889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5919,13 +5908,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5935,13 +5924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5951,14 +5940,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5968,13 +5957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5984,13 +5973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1651"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6000,11 +5989,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     }
    ],
    "return_type" : "type-2",
@@ -6017,13 +6006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6033,10 +6022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6046,10 +6035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6058,13 +6047,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6074,10 +6063,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6087,16 +6076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6105,14 +6094,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6121,14 +6110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6139,13 +6128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6155,13 +6144,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6171,13 +6160,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6186,10 +6175,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "referenced_type" : "type-11"
@@ -6207,10 +6196,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
      "referenced_type" : "type-11"
@@ -6229,16 +6218,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
      "default_arg" : true,
@@ -6246,7 +6235,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1681"
     }
    ],
    "return_type" : "type-2",
@@ -6260,13 +6249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6275,16 +6264,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1683"
     }
    ],
    "return_type" : "type-2",
@@ -6298,10 +6287,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6311,13 +6300,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6327,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6343,10 +6332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6356,10 +6345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6369,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6382,16 +6371,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6401,13 +6390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6417,13 +6406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6433,13 +6422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6449,13 +6438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6465,19 +6454,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6487,13 +6476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6502,22 +6491,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6527,10 +6516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6540,10 +6529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,10 +6542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6566,16 +6555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6585,13 +6574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6601,13 +6590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6617,14 +6606,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6634,16 +6623,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6653,13 +6642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6669,13 +6658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6685,14 +6674,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6702,13 +6691,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6718,13 +6707,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6734,11 +6723,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     }
    ],
    "return_type" : "type-2",
@@ -6751,13 +6740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6767,10 +6756,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6780,10 +6769,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6792,13 +6781,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6808,10 +6797,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6821,16 +6810,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6839,14 +6828,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6855,14 +6844,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6871,14 +6860,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6889,13 +6878,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,13 +6894,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6921,13 +6910,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6937,16 +6926,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
      "default_arg" : true,
@@ -6954,7 +6943,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1700"
     }
    ],
    "return_type" : "type-2",
@@ -6968,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6983,16 +6972,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1702"
     }
    ],
    "return_type" : "type-2",
@@ -7006,10 +6995,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7019,13 +7008,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7035,13 +7024,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7051,10 +7040,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7064,10 +7053,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7077,10 +7066,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7090,16 +7079,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7109,13 +7098,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7125,13 +7114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7141,16 +7130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7160,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7176,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7192,16 +7181,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7211,13 +7200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7227,10 +7216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7240,10 +7229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7253,19 +7242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7275,16 +7264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7294,19 +7283,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7315,22 +7304,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1158"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7340,16 +7329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7359,16 +7348,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7378,13 +7367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7394,10 +7383,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7407,16 +7396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7426,13 +7415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1709"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7442,13 +7431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7458,13 +7447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7474,14 +7463,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7491,16 +7480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7510,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1710"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7526,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1711"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7542,14 +7531,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7559,13 +7548,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7575,13 +7564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7591,11 +7580,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     }
    ],
    "return_type" : "type-2",
@@ -7608,13 +7597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1713"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7624,10 +7613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7637,10 +7626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7649,13 +7638,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7665,10 +7654,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7678,16 +7667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7696,14 +7685,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7712,14 +7701,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7729,14 +7718,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7746,16 +7735,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7765,13 +7754,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1714"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7781,13 +7770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1715"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7797,14 +7786,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7814,13 +7803,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7830,13 +7819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7846,11 +7835,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     }
    ],
    "return_type" : "type-2",
@@ -7863,13 +7852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1694"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7879,10 +7868,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7892,10 +7881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7904,13 +7893,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7920,10 +7909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7933,16 +7922,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7951,14 +7940,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7967,14 +7956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7983,14 +7972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7999,14 +7988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -8017,13 +8006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1697"
+     "referenced_type" : "type-1720"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8033,13 +8022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8049,13 +8038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8066,13 +8055,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-1725"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8082,13 +8071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8098,13 +8087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8114,16 +8103,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
      "default_arg" : true,
@@ -8131,7 +8120,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1732"
     }
    ],
    "return_type" : "type-2",
@@ -8145,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8160,16 +8149,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-1734"
     }
    ],
    "return_type" : "type-2",
@@ -8183,10 +8172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8196,13 +8185,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8212,13 +8201,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8228,10 +8217,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8241,10 +8230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8254,10 +8243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8267,16 +8256,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
      "default_arg" : true,
@@ -8284,7 +8273,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-1735"
     }
    ],
    "return_type" : "type-2",
@@ -8298,13 +8287,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8313,16 +8302,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1714"
+     "referenced_type" : "type-1737"
     }
    ],
    "return_type" : "type-2",
@@ -8334,16 +8323,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1715"
+     "referenced_type" : "type-1738"
     }
    ],
    "return_type" : "type-2",
@@ -8355,16 +8344,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1716"
+     "referenced_type" : "type-1739"
     }
    ],
    "return_type" : "type-2",
@@ -8376,16 +8365,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1717"
+     "referenced_type" : "type-1740"
     }
    ],
    "return_type" : "type-2",
@@ -8397,16 +8386,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1718"
+     "referenced_type" : "type-1741"
     }
    ],
    "return_type" : "type-2",
@@ -8420,10 +8409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8433,13 +8422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8449,13 +8438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8465,10 +8454,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8478,10 +8467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8491,10 +8480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8504,16 +8493,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8523,13 +8512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8539,13 +8528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8555,13 +8544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8571,13 +8560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1721"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8586,19 +8575,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8608,13 +8597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1722"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8624,10 +8613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8637,10 +8626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8650,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8663,16 +8652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8682,16 +8671,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8701,13 +8690,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8717,13 +8706,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8733,16 +8722,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8752,19 +8741,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8774,13 +8763,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1723"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8790,13 +8779,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1747"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8806,16 +8795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8825,19 +8814,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8847,13 +8836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8863,13 +8852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1725"
+     "referenced_type" : "type-1748"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8879,16 +8868,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1726"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8897,22 +8886,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8921,22 +8910,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8946,13 +8935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8962,10 +8951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8975,10 +8964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8988,22 +8977,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9013,16 +9002,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-1751"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9032,19 +9021,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9054,16 +9043,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9073,16 +9062,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9092,19 +9081,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9113,25 +9102,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9140,19 +9129,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9161,19 +9150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9183,16 +9172,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9202,16 +9191,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9221,13 +9210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9237,10 +9226,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9250,16 +9239,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9269,13 +9258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1731"
+     "referenced_type" : "type-1754"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9285,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9301,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9316,12 +9305,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-406", "type-153" ]
+   "template_args" : [ "type-31", "type-420", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9329,12 +9318,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9342,12 +9331,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9355,12 +9344,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9368,10 +9357,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-375"
     }
    ],
    "return_type" : "type-2",
@@ -9383,10 +9372,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-561"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     }
    ],
    "return_type" : "type-2",
@@ -9398,10 +9387,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
    "return_type" : "type-2",
@@ -9413,10 +9402,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-291",
+   "return_type" : "type-296",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9425,13 +9414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9446,19 +9435,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9467,10 +9456,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-377"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9498,14 +9487,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-576"
     }
    ],
    "return_type" : "type-2",
@@ -9518,10 +9507,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9531,16 +9520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9549,7 +9538,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "referenced_type" : "type-2"
@@ -9558,7 +9547,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9573,10 +9562,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9594,10 +9583,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9615,10 +9604,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9639,10 +9628,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9651,10 +9640,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9672,10 +9661,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9693,10 +9682,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9714,28 +9703,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-428",
+   "return_type" : "type-439",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9745,13 +9734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-369"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9761,10 +9750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
-   "return_type" : "type-354",
+   "return_type" : "type-359",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9774,19 +9763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9796,19 +9785,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9820,22 +9809,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9844,18 +9833,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9863,18 +9852,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9882,18 +9871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9901,18 +9890,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9920,18 +9909,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9939,18 +9928,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9958,18 +9947,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9977,18 +9966,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -9996,10 +9985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-749",
+   "return_type" : "type-764",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10008,12 +9997,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10021,12 +10010,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10034,12 +10023,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10047,17 +10036,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10072,13 +10061,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10087,18 +10076,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10106,18 +10095,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10125,18 +10114,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10144,18 +10133,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10163,29 +10152,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10194,19 +10183,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10215,10 +10204,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10227,10 +10216,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10239,10 +10228,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10254,79 +10243,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-764",
+   "referenced_type" : "type-779",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-765",
+   "referenced_type" : "type-780",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-374",
+   "referenced_type" : "type-409",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10336,8 +10325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-466",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10345,8 +10334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-476",
+   "referenced_type" : "type-483",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10354,8 +10343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-329",
+   "referenced_type" : "type-325",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10363,17 +10352,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-317",
+   "referenced_type" : "type-317",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-697",
+   "self_type" : "type-709",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-703",
+   "self_type" : "type-712",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10381,8 +10388,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10390,8 +10397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10399,8 +10406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10408,8 +10415,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10417,8 +10424,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10426,8 +10433,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-954",
-   "self_type" : "type-958",
+   "referenced_type" : "type-977",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10435,8 +10442,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-1073",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10444,8 +10451,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-1144",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10453,8 +10460,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-1213",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10462,8 +10469,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-1291",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10471,8 +10478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-294",
+   "referenced_type" : "type-151",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10480,8 +10487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-400",
+   "referenced_type" : "type-19",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10498,8 +10505,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-979",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10507,8 +10514,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-626",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10516,8 +10523,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10525,8 +10532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10534,8 +10541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10543,8 +10550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-281",
+   "referenced_type" : "type-281",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10552,8 +10559,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10561,8 +10568,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-978",
-   "self_type" : "type-988",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10570,8 +10577,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-625",
-   "self_type" : "type-977",
+   "referenced_type" : "type-636",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10579,8 +10586,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-632",
-   "self_type" : "type-636",
+   "referenced_type" : "type-644",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10588,8 +10595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10597,8 +10604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10606,8 +10613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-518",
+   "referenced_type" : "type-439",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10615,8 +10622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10624,8 +10631,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-917",
-   "self_type" : "type-950",
+   "referenced_type" : "type-937",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10633,8 +10640,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-85",
-   "self_type" : "type-661",
+   "referenced_type" : "type-94",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10642,8 +10649,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-181",
-   "self_type" : "type-943",
+   "referenced_type" : "type-188",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10651,8 +10658,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-61",
-   "self_type" : "type-945",
+   "referenced_type" : "type-68",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10660,8 +10667,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10669,8 +10676,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-70",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10678,8 +10685,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10687,8 +10694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-379",
-   "self_type" : "type-501",
+   "referenced_type" : "type-384",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10696,8 +10703,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-359",
-   "self_type" : "type-485",
+   "referenced_type" : "type-364",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10705,8 +10712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
+   "referenced_type" : "type-331",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10714,8 +10721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-316",
+   "referenced_type" : "type-319",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10723,8 +10730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10732,8 +10739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1137",
    "size" : 4,
    "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"
   },
@@ -10741,8 +10748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1204",
    "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"
   },
@@ -10750,8 +10757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10759,8 +10766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1281",
    "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"
   },
@@ -10768,8 +10775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10777,8 +10784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "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"
   },
@@ -10786,8 +10793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10795,8 +10802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-961",
+   "referenced_type" : "type-552",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10804,8 +10811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10813,8 +10820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-551",
+   "referenced_type" : "type-90",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10822,8 +10829,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10831,8 +10838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10840,8 +10847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-298",
-   "self_type" : "type-299",
+   "referenced_type" : "type-303",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10849,8 +10856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-279",
-   "self_type" : "type-280",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10858,8 +10865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-279",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10867,8 +10874,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-1363",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10876,8 +10883,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-630",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-642",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10885,8 +10892,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-992",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10894,8 +10901,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-637",
-   "self_type" : "type-639",
+   "referenced_type" : "type-648",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10903,8 +10910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-554",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10912,8 +10919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10921,8 +10928,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-392",
-   "self_type" : "type-393",
+   "referenced_type" : "type-397",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10930,8 +10937,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-991",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10939,8 +10946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-519",
-   "self_type" : "type-706",
+   "referenced_type" : "type-530",
+   "self_type" : "type-728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10948,8 +10955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10957,8 +10964,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-916",
-   "self_type" : "type-919",
+   "referenced_type" : "type-936",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10966,8 +10973,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-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10975,8 +10982,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-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10984,8 +10991,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10993,8 +11000,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11002,8 +11009,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11011,8 +11018,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11020,8 +11027,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11029,8 +11036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-499",
-   "self_type" : "type-500",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11038,8 +11045,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11047,8 +11054,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-362",
-   "self_type" : "type-364",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11056,8 +11063,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-490",
-   "self_type" : "type-491",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11065,8 +11072,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-486",
-   "self_type" : "type-702",
+   "referenced_type" : "type-497",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11074,8 +11081,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11083,8 +11090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11092,8 +11099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11101,79 +11108,72 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1087",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1108",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1179",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1247",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1490",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1529",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1551",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11186,79 +11186,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-547",
-   "self_type" : "type-549",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-621",
-   "self_type" : "type-624",
+   "referenced_type" : "type-558",
+   "self_type" : "type-560",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-672",
-   "self_type" : "type-674",
+   "referenced_type" : "type-633",
+   "self_type" : "type-635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-813",
-   "self_type" : "type-816",
+   "referenced_type" : "type-739",
+   "self_type" : "type-741",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-835",
+   "self_type" : "type-837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-987",
+   "referenced_type" : "type-909",
+   "self_type" : "type-911",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-973",
+   "referenced_type" : "type-986",
+   "self_type" : "type-991",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-992",
+   "self_type" : "type-994",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-351",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11266,8 +11273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11275,8 +11282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11284,8 +11291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11293,8 +11300,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-1015",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11302,8 +11309,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-1098",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1120",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11311,8 +11318,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-1168",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11320,8 +11327,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-1236",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11329,8 +11336,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-1289",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11338,8 +11345,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-1319",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11347,8 +11354,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1391",
    "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"
   },
@@ -11356,197 +11363,125 @@
    "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-1477",
-   "self_type" : "type-1479",
-   "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-1545",
-   "self_type" : "type-1547",
-   "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-155",
-   "self_type" : "type-157",
-   "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-401",
-   "self_type" : "type-403",
-   "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-562",
-   "self_type" : "type-564",
-   "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-650",
-   "self_type" : "type-652",
-   "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-833",
-   "self_type" : "type-835",
-   "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-1541",
-   "self_type" : "type-1540",
-   "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-645",
-   "self_type" : "type-644",
-   "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-1280",
-   "self_type" : "type-1279",
-   "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-396",
-   "self_type" : "type-395",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
-   "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
-   "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-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1055",
-   "self_type" : "type-1054",
-   "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-1123",
-   "self_type" : "type-1122",
-   "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-1188",
-   "self_type" : "type-1187",
-   "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-1241",
-   "self_type" : "type-1240",
-   "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-1264",
-   "self_type" : "type-1263",
-   "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-1336",
-   "self_type" : "type-1335",
-   "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-1390",
-   "self_type" : "type-1389",
-   "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-1409",
-   "self_type" : "type-1408",
-   "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-1499",
-   "self_type" : "type-1498",
+   "self_type" : "type-1501",
+   "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-1567",
+   "self_type" : "type-1569",
+   "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-162",
+   "self_type" : "type-164",
+   "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-406",
+   "self_type" : "type-408",
+   "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-573",
+   "self_type" : "type-576",
+   "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-661",
+   "self_type" : "type-663",
+   "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-855",
+   "self_type" : "type-857",
+   "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-1563",
+   "self_type" : "type-1562",
+   "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-657",
+   "self_type" : "type-656",
+   "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-1290",
+   "self_type" : "type-1289",
+   "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-401",
+   "self_type" : "type-400",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
+   "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-843",
+   "self_type" : "type-845",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1074",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11554,8 +11489,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-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11563,8 +11498,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-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11572,8 +11507,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-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11581,8 +11516,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11590,8 +11525,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11599,8 +11534,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-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11608,8 +11543,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-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11617,8 +11552,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-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1520",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11626,8 +11561,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-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11635,8 +11570,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-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11644,8 +11579,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-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11653,8 +11588,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
+   "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-266",
+   "self_type" : "type-265",
+   "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-390",
+   "self_type" : "type-389",
+   "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-601",
+   "self_type" : "type-600",
+   "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-673",
+   "self_type" : "type-672",
+   "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-721",
+   "self_type" : "type-720",
+   "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-785",
+   "self_type" : "type-784",
+   "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-890",
+   "self_type" : "type-889",
+   "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-924",
+   "self_type" : "type-923",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11662,8 +11669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11671,8 +11678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11680,8 +11687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11689,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11699,7 +11706,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-309",
+   "self_type" : "type-314",
    "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"
   },
@@ -11707,8 +11714,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-577",
+   "referenced_type" : "type-103",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -11719,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-471",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -11728,8 +11735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
+   "referenced_type" : "type-473",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11737,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-467",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11746,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-474",
+   "referenced_type" : "type-483",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11755,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-477",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11764,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11773,8 +11780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11782,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11791,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11800,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11809,8 +11816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11818,8 +11825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11827,8 +11834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11836,8 +11843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11845,8 +11852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11854,17 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11881,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11890,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11899,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11908,8 +11906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11917,8 +11915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11926,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11935,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-809",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11944,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11953,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11962,8 +11960,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11971,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11980,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11989,8 +11996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -11998,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-320",
-   "self_type" : "type-330",
+   "referenced_type" : "type-325",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12007,8 +12014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-312",
-   "self_type" : "type-318",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12016,8 +12023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12025,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-494",
+   "referenced_type" : "type-418",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -12034,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12043,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12052,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12061,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12070,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12079,8 +12086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12088,8 +12095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12097,8 +12104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "type-386",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12106,8 +12113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12115,8 +12122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-801",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12124,8 +12131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12133,8 +12140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12142,8 +12149,8 @@
    "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-682",
-   "self_type" : "type-685",
+   "referenced_type" : "type-697",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12151,8 +12158,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-688",
-   "self_type" : "type-692",
+   "referenced_type" : "type-703",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12160,8 +12167,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-374",
-   "self_type" : "type-387",
+   "referenced_type" : "type-379",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12169,8 +12176,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-245",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-252",
+   "self_type" : "type-666",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12178,8 +12185,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-239",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-246",
+   "self_type" : "type-414",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12196,8 +12203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12205,8 +12212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12214,8 +12221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12223,8 +12230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12232,8 +12239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12241,8 +12248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12250,8 +12257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12259,8 +12266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12268,8 +12275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12277,8 +12284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12286,8 +12293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12295,8 +12302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12304,8 +12311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12313,8 +12320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12322,8 +12329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12331,8 +12338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-705",
-   "self_type" : "type-704",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12340,8 +12347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12349,8 +12356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12358,8 +12365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12367,8 +12374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12376,8 +12383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12385,8 +12392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12394,8 +12401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12403,8 +12410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12412,8 +12419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12421,8 +12428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12430,8 +12437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12439,8 +12446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12448,8 +12455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12457,8 +12464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12466,8 +12473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12475,8 +12482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-561",
+   "referenced_type" : "type-570",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -12484,8 +12491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12493,8 +12500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 4,
    "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"
   },
@@ -12502,26 +12509,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
-   "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-1206",
    "self_type" : "type-1205",
    "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-1215",
+   "self_type" : "type-1214",
+   "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-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "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"
   },
@@ -12529,8 +12536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12538,8 +12545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "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"
   },
@@ -12547,8 +12554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12556,8 +12563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12565,8 +12572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12574,8 +12581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12583,8 +12590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12592,8 +12599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12601,8 +12608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12610,8 +12617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12619,8 +12626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12628,8 +12635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12637,8 +12644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12646,8 +12653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12655,8 +12662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12664,8 +12671,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12673,8 +12680,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12682,8 +12689,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-954",
-   "self_type" : "type-956",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12691,8 +12698,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-1073",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12700,8 +12707,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-1144",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12709,8 +12716,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-1213",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12718,8 +12725,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-1291",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12727,8 +12734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-273",
+   "referenced_type" : "type-151",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12736,8 +12743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-383",
+   "referenced_type" : "type-19",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12746,7 +12753,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-537",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12754,8 +12761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12763,17 +12770,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-708",
+   "self_type" : "type-710",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-711",
+   "self_type" : "type-713",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-409",
+   "self_type" : "type-411",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-665",
+   "self_type" : "type-667",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-413",
+   "self_type" : "type-415",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-405",
+   "referenced_type" : "type-56",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12781,375 +12833,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
-   "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-784",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-979",
-   "self_type" : "type-1049",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-626",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-131",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
-   "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-982",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
-   "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_string *",
-   "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-978",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-625",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-130",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-632",
-   "self_type" : "type-635",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<int> *",
-   "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
-   "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-333",
-   "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::hidl::base::V1_0::BpHwBase *",
-   "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
-   "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
-   "size" : 4,
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
-   "size" : 4,
-   "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::hidl::manager::V1_0::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1062",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
-   "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::hidl::manager::V1_1::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-1136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
-   "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
-   "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::hidl::manager::V1_2::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-1199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1198",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
-   "name" : "android::hidl::manager::V1_2::IClientCallback *",
    "referenced_type" : "type-72",
    "self_type" : "type-71",
    "size" : 4,
@@ -13157,10 +12840,379 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-1000",
+   "self_type" : "type-1067",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-637",
+   "self_type" : "type-1063",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-137",
+   "self_type" : "type-166",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
+   "name" : "android::hardware::details::hidl_pointer<int> *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-20",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_string *",
+   "name" : "android::hardware::hidl_string *",
+   "referenced_type" : "type-141",
+   "self_type" : "type-639",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-999",
+   "self_type" : "type-1005",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-636",
+   "self_type" : "type-995",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-136",
+   "self_type" : "type-150",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-644",
+   "self_type" : "type-646",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<int> *",
+   "name" : "android::hardware::hidl_vec<int> *",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
+   "name" : "android::hidl::base::V1_0::BnHwBase *",
+   "referenced_type" : "type-160",
+   "self_type" : "type-338",
+   "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::hidl::base::V1_0::BpHwBase *",
+   "name" : "android::hidl::base::V1_0::BpHwBase *",
+   "referenced_type" : "type-420",
+   "self_type" : "type-950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
+   "name" : "android::hidl::base::V1_0::BsBase *",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1366",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
+   "size" : 4,
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
+   "size" : 4,
+   "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::hidl::manager::V1_0::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
+   "referenced_type" : "type-192",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "referenced_type" : "type-181",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "referenced_type" : "type-944",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "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::hidl::manager::V1_1::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
+   "name" : "android::hidl::manager::V1_1::IServiceManager *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
+   "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::hidl::manager::V1_2::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "referenced_type" : "type-209",
+   "self_type" : "type-1222",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
+   "name" : "android::hidl::manager::V1_2::IClientCallback *",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13168,8 +13220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13177,8 +13229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-951",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13186,8 +13238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-514",
+   "referenced_type" : "type-439",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13195,8 +13247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13204,8 +13256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-529",
+   "referenced_type" : "type-536",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13213,8 +13265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13222,339 +13274,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-917",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-498",
-   "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-910",
-   "self_type" : "type-915",
-   "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-354",
-   "self_type" : "type-489",
-   "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-359",
-   "self_type" : "type-482",
-   "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-449",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-327",
-   "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-314",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1022",
-   "self_type" : "type-1023",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-390",
-   "self_type" : "type-391",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-647",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-398",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1452",
-   "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-521",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-959",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1077",
-   "self_type" : "type-1078",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1148",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1219",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1296",
-   "self_type" : "type-1297",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -13562,10 +13281,343 @@
   },
   {
    "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-937",
+   "self_type" : "type-970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-505",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-612",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-509",
+   "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-930",
+   "self_type" : "type-935",
+   "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-359",
+   "self_type" : "type-501",
+   "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-364",
+   "self_type" : "type-490",
+   "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-460",
+   "self_type" : "type-464",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-356",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-331",
+   "self_type" : "type-332",
+   "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-319",
+   "self_type" : "type-320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1044",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-395",
+   "self_type" : "type-396",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-659",
+   "self_type" : "type-660",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1474",
+   "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-533",
+   "self_type" : "type-535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-981",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1098",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1168",
+   "self_type" : "type-1169",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1237",
+   "self_type" : "type-1238",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1317",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-553",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-813",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13573,8 +13625,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-654",
-   "self_type" : "type-655",
+   "referenced_type" : "type-669",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13582,8 +13634,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13591,8 +13643,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-567",
+   "referenced_type" : "type-132",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13600,8 +13652,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13609,8 +13661,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-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13618,8 +13670,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-522",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13627,8 +13679,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-284",
+   "referenced_type" : "type-284",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13636,8 +13688,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-629",
+   "referenced_type" : "type-279",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13645,8 +13697,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-1363",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13654,8 +13706,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-630",
-   "self_type" : "type-631",
+   "referenced_type" : "type-642",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13663,8 +13715,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-992",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13672,8 +13724,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-637",
-   "self_type" : "type-638",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13681,8 +13733,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-553",
+   "referenced_type" : "type-563",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13690,8 +13742,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-293",
+   "referenced_type" : "type-297",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13699,8 +13751,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-414",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
    "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"
   },
@@ -13708,8 +13760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-383",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -13726,8 +13778,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -13735,8 +13787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13744,8 +13796,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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13753,8 +13805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-570",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "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"
   },
@@ -13762,8 +13814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -13771,8 +13823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "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"
   },
@@ -13780,8 +13832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -13789,8 +13841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -13798,8 +13850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "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"
   },
@@ -13807,8 +13859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "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"
   },
@@ -13816,15 +13868,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
-   "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-530",
    "self_type" : "type-531",
    "size" : 4,
@@ -13832,10 +13875,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
+   "name" : "const android::sp<android::hardware::ProcessState> *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-614",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13843,8 +13895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13852,8 +13904,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-916",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13861,8 +13913,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-492",
-   "self_type" : "type-509",
+   "referenced_type" : "type-504",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13870,8 +13922,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-483",
-   "self_type" : "type-513",
+   "referenced_type" : "type-494",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13879,8 +13931,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-223",
-   "self_type" : "type-597",
+   "referenced_type" : "type-230",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13888,8 +13940,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-60",
-   "self_type" : "type-604",
+   "referenced_type" : "type-67",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13897,8 +13949,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-30",
-   "self_type" : "type-599",
+   "referenced_type" : "type-37",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13906,8 +13958,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-69",
-   "self_type" : "type-608",
+   "referenced_type" : "type-74",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13915,8 +13967,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-41",
-   "self_type" : "type-602",
+   "referenced_type" : "type-48",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13924,8 +13976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-504",
+   "referenced_type" : "type-511",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13933,8 +13985,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13942,8 +13994,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-486",
-   "self_type" : "type-487",
+   "referenced_type" : "type-497",
+   "self_type" : "type-498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13951,8 +14003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13960,8 +14012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14021,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-989",
+   "referenced_type" : "type-158",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13978,8 +14030,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-348",
+   "referenced_type" : "type-351",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13987,8 +14039,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13996,8 +14048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-999",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14005,8 +14057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-301",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14014,8 +14066,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-460",
+   "referenced_type" : "type-470",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -14024,7 +14076,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14032,8 +14084,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-350",
+   "referenced_type" : "type-348",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14042,7 +14094,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14050,8 +14102,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-450",
+   "referenced_type" : "type-103",
+   "self_type" : "type-461",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -14060,7 +14112,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-1010",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14068,8 +14120,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-416",
+   "referenced_type" : "type-22",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14077,8 +14129,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-416",
-   "self_type" : "type-461",
+   "referenced_type" : "type-427",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -14090,8 +14142,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14100,8 +14152,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14110,8 +14162,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14120,8 +14172,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14130,8 +14182,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14140,8 +14192,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14150,8 +14202,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14160,8 +14212,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14170,18 +14222,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14200,8 +14242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14210,8 +14252,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14220,8 +14262,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14230,8 +14272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +14282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-669",
-   "self_type" : "type-671",
+   "referenced_type" : "type-629",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14250,8 +14292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
+   "referenced_type" : "type-683",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14260,8 +14302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-809",
-   "self_type" : "type-811",
+   "referenced_type" : "type-735",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-882",
-   "self_type" : "type-884",
+   "referenced_type" : "type-829",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14280,8 +14322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-903",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14290,8 +14332,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-966",
-   "self_type" : "type-968",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +14352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -14310,8 +14362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14320,8 +14372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-320",
-   "self_type" : "type-326",
+   "referenced_type" : "type-325",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14330,8 +14382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-312",
-   "self_type" : "type-314",
+   "referenced_type" : "type-317",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14340,8 +14392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-426",
+   "self_type" : "type-428",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14350,8 +14402,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-682",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-697",
+   "self_type" : "type-1044",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14360,8 +14412,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-688",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-703",
+   "self_type" : "type-1046",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14370,8 +14422,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-374",
-   "self_type" : "type-390",
+   "referenced_type" : "type-379",
+   "self_type" : "type-395",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14380,8 +14432,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-245",
-   "self_type" : "type-647",
+   "referenced_type" : "type-252",
+   "self_type" : "type-659",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14390,8 +14442,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<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-239",
-   "self_type" : "type-398",
+   "referenced_type" : "type-246",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14400,8 +14452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1472",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14420,8 +14472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14430,8 +14482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -14440,8 +14492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "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"
   },
@@ -14450,8 +14502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1211",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14460,8 +14512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "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"
   },
@@ -14470,8 +14522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14480,8 +14532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "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"
   },
@@ -14490,8 +14542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14500,8 +14552,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14510,8 +14562,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14520,8 +14572,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-954",
-   "self_type" : "type-959",
+   "referenced_type" : "type-977",
+   "self_type" : "type-981",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14530,8 +14582,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-1073",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1098",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14540,8 +14592,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-1144",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1168",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14550,8 +14602,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-1213",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14560,8 +14612,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-1291",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1317",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14570,8 +14622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-541",
+   "referenced_type" : "type-151",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14580,8 +14632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14591,7 +14643,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14600,8 +14652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1043",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14610,8 +14662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14620,8 +14672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14682,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-979",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14640,8 +14692,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-626",
-   "self_type" : "type-654",
+   "referenced_type" : "type-637",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14650,8 +14702,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14660,8 +14712,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14670,8 +14722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-332",
+   "referenced_type" : "type-20",
+   "self_type" : "type-337",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14680,8 +14732,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-982",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1384",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14690,8 +14742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-510",
+   "referenced_type" : "type-361",
+   "self_type" : "type-522",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14700,8 +14752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-298",
+   "referenced_type" : "type-273",
+   "self_type" : "type-303",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14710,8 +14762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-279",
+   "referenced_type" : "type-281",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14720,8 +14772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-274",
+   "referenced_type" : "type-141",
+   "self_type" : "type-279",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14730,8 +14782,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-978",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14740,8 +14792,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-636",
+   "self_type" : "type-642",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14750,8 +14802,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-130",
-   "self_type" : "type-992",
+   "referenced_type" : "type-136",
+   "self_type" : "type-1013",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14760,8 +14812,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-632",
-   "self_type" : "type-637",
+   "referenced_type" : "type-644",
+   "self_type" : "type-648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14770,8 +14822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-550",
+   "referenced_type" : "type-127",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14780,8 +14832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-292",
+   "referenced_type" : "type-295",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,8 +14842,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-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-420",
+   "self_type" : "type-424",
    "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"
   },
@@ -14800,8 +14852,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-141",
-   "self_type" : "type-308",
+   "referenced_type" : "type-147",
+   "self_type" : "type-313",
    "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"
   },
@@ -14810,8 +14862,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-24",
-   "self_type" : "type-378",
+   "referenced_type" : "type-31",
+   "self_type" : "type-383",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14820,8 +14872,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-377",
-   "self_type" : "type-392",
+   "referenced_type" : "type-382",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14830,8 +14882,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -14840,8 +14892,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -14850,8 +14902,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-23",
-   "self_type" : "type-574",
+   "referenced_type" : "type-30",
+   "self_type" : "type-585",
    "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"
   },
@@ -14860,8 +14912,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-134",
-   "self_type" : "type-991",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1012",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14870,8 +14922,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-573",
-   "self_type" : "type-578",
+   "referenced_type" : "type-584",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14880,8 +14932,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-96",
-   "self_type" : "type-576",
+   "referenced_type" : "type-102",
+   "self_type" : "type-587",
    "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"
   },
@@ -14890,8 +14942,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-63",
-   "self_type" : "type-568",
+   "referenced_type" : "type-70",
+   "self_type" : "type-580",
    "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"
   },
@@ -14900,8 +14952,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -14910,8 +14962,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-22",
-   "self_type" : "type-583",
+   "referenced_type" : "type-29",
+   "self_type" : "type-595",
    "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"
   },
@@ -14920,8 +14972,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -14930,8 +14982,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -14940,8 +14992,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-72",
-   "self_type" : "type-571",
+   "referenced_type" : "type-77",
+   "self_type" : "type-582",
    "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"
   },
@@ -14950,8 +15002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-586",
+   "referenced_type" : "type-51",
+   "self_type" : "type-597",
    "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"
   },
@@ -14960,8 +15012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-519",
+   "referenced_type" : "type-439",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14980,8 +15032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15042,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-609",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15000,8 +15052,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15010,8 +15062,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-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15020,8 +15072,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-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15030,8 +15082,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-85",
-   "self_type" : "type-483",
+   "referenced_type" : "type-94",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15040,8 +15092,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15050,8 +15102,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15060,8 +15112,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15070,8 +15122,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15132,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +15142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-499",
+   "referenced_type" : "type-384",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,16 +15151,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1200",
    "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-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -15116,8 +15168,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-354",
-   "self_type" : "type-490",
+   "referenced_type" : "type-359",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15126,8 +15178,8 @@
    "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-359",
-   "self_type" : "type-486",
+   "referenced_type" : "type-364",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15136,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15146,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15156,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15166,8 +15218,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15176,8 +15228,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15187,7 +15239,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15195,80 +15247,72 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1488",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1527",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1549",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15283,80 +15327,88 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15364,8 +15416,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-346",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15374,8 +15426,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15385,7 +15437,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-272",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15394,8 +15446,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15404,8 +15456,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15414,8 +15466,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-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15424,8 +15476,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-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15434,8 +15486,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-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15444,8 +15496,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-1166",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15454,8 +15506,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-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15464,8 +15516,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15474,8 +15526,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-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15484,8 +15536,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-1405",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15494,8 +15546,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-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15504,8 +15556,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-147",
-   "self_type" : "type-146",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15514,8 +15566,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-1539",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15524,8 +15576,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-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15544,8 +15596,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-237",
-   "self_type" : "type-236",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15554,8 +15606,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-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15564,8 +15616,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-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15574,8 +15626,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-642",
-   "self_type" : "type-641",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15584,8 +15636,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-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15594,8 +15646,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15604,8 +15656,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-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-851",
+   "self_type" : "type-850",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15614,8 +15666,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-893",
-   "self_type" : "type-892",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15624,8 +15676,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-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15634,8 +15686,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-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15644,8 +15696,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-1181",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15654,8 +15706,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-1254",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15664,8 +15716,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15674,8 +15726,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-1387",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15684,8 +15736,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-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15694,8 +15746,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-1571",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15704,8 +15756,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15714,8 +15766,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15724,8 +15776,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-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15734,8 +15786,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-697",
-   "self_type" : "type-696",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15744,8 +15796,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-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15754,8 +15806,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-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15764,8 +15816,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-1041",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "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"
   },
@@ -15774,8 +15826,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-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "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"
   },
@@ -15784,8 +15836,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-1179",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "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"
   },
@@ -15794,8 +15846,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-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "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"
   },
@@ -15804,8 +15856,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-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "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"
   },
@@ -15814,8 +15866,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-1385",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "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"
   },
@@ -15824,8 +15876,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-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1513",
+   "self_type" : "type-1512",
    "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"
   },
@@ -15834,8 +15886,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-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "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"
   },
@@ -15844,8 +15896,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -15854,8 +15906,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -15864,8 +15916,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-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "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"
   },
@@ -15874,8 +15926,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-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-716",
+   "self_type" : "type-715",
    "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"
   },
@@ -15884,8 +15936,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "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"
   },
@@ -15894,8 +15946,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-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
    "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"
   },
@@ -15904,8 +15956,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-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1038",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15914,8 +15966,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-1099",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15924,8 +15976,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-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1187",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15934,8 +15986,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-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1259",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15944,8 +15996,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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15954,8 +16006,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-1320",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15964,8 +16016,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
    "size" : 12,
    "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"
   },
@@ -15974,368 +16026,278 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
-   "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-1546",
-   "self_type" : "type-1545",
-   "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-156",
-   "self_type" : "type-155",
-   "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-402",
-   "self_type" : "type-401",
-   "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-563",
-   "self_type" : "type-562",
-   "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-651",
-   "self_type" : "type-650",
-   "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-834",
-   "self_type" : "type-833",
-   "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-1542",
-   "self_type" : "type-1541",
-   "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-646",
-   "self_type" : "type-645",
-   "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-1281",
-   "self_type" : "type-1280",
-   "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-397",
-   "self_type" : "type-396",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "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-373",
-   "self_type" : "type-372",
-   "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-1094",
-   "self_type" : "type-1093",
-   "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-1162",
-   "self_type" : "type-1161",
-   "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-1231",
-   "self_type" : "type-1230",
-   "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-1308",
-   "self_type" : "type-1307",
-   "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-1360",
-   "self_type" : "type-1359",
-   "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-986",
-   "self_type" : "type-985",
-   "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-1092",
-   "self_type" : "type-1091",
-   "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-1160",
-   "self_type" : "type-1159",
-   "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-1229",
-   "self_type" : "type-1228",
-   "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-1306",
-   "self_type" : "type-1305",
-   "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-1358",
-   "self_type" : "type-1357",
-   "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-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::vector<int, std::allocator<int> >",
-   "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "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-822",
-   "self_type" : "type-821",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1056",
-   "self_type" : "type-1055",
-   "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-1124",
-   "self_type" : "type-1123",
-   "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-1189",
-   "self_type" : "type-1188",
-   "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-1242",
-   "self_type" : "type-1241",
-   "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-1265",
-   "self_type" : "type-1264",
-   "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-1337",
-   "self_type" : "type-1336",
-   "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-1391",
-   "self_type" : "type-1390",
-   "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-1410",
-   "self_type" : "type-1409",
-   "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-1500",
    "self_type" : "type-1499",
    "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-163",
+   "self_type" : "type-162",
+   "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-407",
+   "self_type" : "type-406",
+   "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-574",
+   "self_type" : "type-573",
+   "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-662",
+   "self_type" : "type-661",
+   "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-856",
+   "self_type" : "type-855",
+   "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-1564",
+   "self_type" : "type-1563",
+   "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-658",
+   "self_type" : "type-657",
+   "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-1291",
+   "self_type" : "type-1290",
+   "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-402",
+   "self_type" : "type-401",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
+   "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-378",
+   "self_type" : "type-377",
+   "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-1007",
+   "self_type" : "type-1006",
+   "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-1113",
+   "self_type" : "type-1112",
+   "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-1183",
+   "self_type" : "type-1182",
+   "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-1251",
+   "self_type" : "type-1250",
+   "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-1330",
+   "self_type" : "type-1329",
+   "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-1382",
+   "self_type" : "type-1381",
+   "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-1111",
+   "self_type" : "type-1110",
+   "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-1181",
+   "self_type" : "type-1180",
+   "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-1249",
+   "self_type" : "type-1248",
+   "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-1328",
+   "self_type" : "type-1327",
+   "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-1380",
+   "self_type" : "type-1379",
+   "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-997",
+   "self_type" : "type-996",
+   "size" : 8,
+   "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-134",
+   "self_type" : "type-133",
+   "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-844",
+   "self_type" : "type-843",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1552",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16344,8 +16306,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-1574",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16354,8 +16316,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-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1209",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16364,8 +16326,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16374,8 +16336,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16384,8 +16346,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-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16394,8 +16356,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-590",
-   "self_type" : "type-589",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16404,8 +16366,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16414,8 +16376,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-700",
-   "self_type" : "type-699",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16424,8 +16386,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16434,8 +16396,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-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16444,8 +16406,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
+   "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-221",
+   "self_type" : "type-220",
+   "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-267",
+   "self_type" : "type-266",
+   "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-391",
+   "self_type" : "type-390",
+   "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-602",
+   "self_type" : "type-601",
+   "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-674",
+   "self_type" : "type-673",
+   "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-722",
+   "self_type" : "type-721",
+   "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-786",
+   "self_type" : "type-785",
+   "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-891",
+   "self_type" : "type-890",
+   "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-925",
+   "self_type" : "type-924",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +16506,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16465,7 +16517,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16475,7 +16527,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16493,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-296",
+   "referenced_type" : "type-22",
+   "self_type" : "type-301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16502,8 +16554,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-480",
+   "referenced_type" : "type-21",
+   "self_type" : "type-493",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -16517,14 +16569,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16536,17 +16588,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-431"
     }
    ],
    "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-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-320", "type-428" ],
+   "template_args" : [ "type-325", "type-439" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16556,17 +16608,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-308",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-302" ],
+   "template_args" : [ "type-307" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -16576,17 +16628,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-418" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16596,14 +16648,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16615,14 +16667,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-477"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16632,7 +16684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-308"
     }
    ],
    "fields" :
@@ -16641,20 +16693,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16666,14 +16718,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16685,14 +16737,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16704,14 +16756,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16724,14 +16776,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -16771,8 +16823,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -16782,8 +16834,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16793,8 +16845,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16826,8 +16878,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16838,17 +16890,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-430"
     }
    ],
    "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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-432" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16895,14 +16947,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16960,14 +17012,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-326"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-325",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16979,14 +17031,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16997,7 +17049,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -17006,25 +17058,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-479"
     },
     {
      "access" : "private",
@@ -17036,19 +17088,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-544"
     },
     {
      "access" : "private",
@@ -17060,8 +17112,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -17151,17 +17203,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -17206,17 +17258,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-436",
+   "self_type" : "type-436",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-357" ],
+   "template_args" : [ "type-362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -17261,17 +17313,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-380" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -17316,17 +17368,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-423" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -17373,7 +17425,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
@@ -17385,20 +17437,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -17450,14 +17502,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -17487,23 +17539,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-698"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-684"
+     "referenced_type" : "type-699"
     }
    ],
    "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-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-404" ],
+   "template_args" : [ "type-364", "type-419" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -17513,23 +17565,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-704"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-705"
     }
    ],
    "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-688",
-   "self_type" : "type-688",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-16" ],
+   "template_args" : [ "type-364", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -17539,23 +17591,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-380"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-381"
     }
    ],
    "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-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-377", "type-379" ],
+   "template_args" : [ "type-382", "type-384" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -17565,23 +17617,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -17591,23 +17643,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -17648,18 +17700,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-281"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -17741,14 +17793,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -17760,13 +17812,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -17783,11 +17835,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -17795,7 +17847,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17804,17 +17856,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -17822,7 +17874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17831,17 +17883,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -17849,7 +17901,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17858,17 +17910,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -17876,7 +17928,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17885,17 +17937,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -17903,7 +17955,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17912,17 +17964,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -17930,7 +17982,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17939,17 +17991,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-1213",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -17957,7 +18009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17966,17 +18018,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -17984,7 +18036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17993,17 +18045,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -18011,17 +18063,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -18060,34 +18112,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-708",
+   "self_type" : "type-708",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-697" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-711",
+   "self_type" : "type-711",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-703" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-409",
+   "self_type" : "type-409",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-379" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-665",
+   "self_type" : "type-665",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-413",
+   "self_type" : "type-413",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -18126,8 +18278,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -18139,14 +18291,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -18155,8 +18307,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -18165,8 +18317,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -18175,8 +18327,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -18212,7 +18364,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -18223,8 +18375,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -18253,16 +18405,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18271,16 +18423,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-638"
     }
    ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -18289,16 +18441,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -18307,16 +18459,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-996"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -18326,7 +18478,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
@@ -18337,8 +18489,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1017",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -18349,16 +18501,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -18368,7 +18520,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -18379,8 +18531,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -18391,16 +18543,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -18410,7 +18562,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -18421,8 +18573,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -18434,7 +18586,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-981"
+     "referenced_type" : "type-1002"
     },
     {
      "field_name" : "_pad",
@@ -18445,8 +18597,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-980",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -18458,7 +18610,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-639"
     },
     {
      "field_name" : "_pad",
@@ -18469,8 +18621,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -18481,13 +18633,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -18500,7 +18652,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -18511,8 +18663,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -18523,13 +18675,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -18542,7 +18694,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -18553,8 +18705,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -18563,8 +18715,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -18582,14 +18734,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -18598,11 +18750,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-998",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -18612,16 +18764,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1004"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-982",
-   "self_type" : "type-982",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -18629,7 +18781,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-365"
     }
    ],
    "fields" :
@@ -18638,7 +18790,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -18650,13 +18802,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -18736,13 +18888,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -18824,19 +18976,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -18848,7 +19000,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -18860,13 +19012,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -18878,7 +19030,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -18890,13 +19042,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -18920,13 +19072,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -18939,7 +19091,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
@@ -18951,16 +19103,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18970,7 +19122,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-637"
     },
     {
      "access" : "private",
@@ -18982,16 +19134,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -19001,7 +19153,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -19013,16 +19165,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -19032,7 +19184,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-995"
+     "referenced_type" : "type-1016"
     },
     {
      "access" : "private",
@@ -19044,16 +19196,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1015",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -19061,7 +19213,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-645"
     }
    ],
    "fields" :
@@ -19069,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-641"
     }
    ],
    "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-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -19088,7 +19240,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -19100,13 +19252,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -19119,19 +19271,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -19141,10 +19293,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19153,13 +19305,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -19281,10 +19433,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-423"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19293,19 +19445,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-422"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -19488,10 +19640,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19500,19 +19652,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "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",
@@ -19648,13 +19800,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "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"
@@ -19665,13 +19817,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -19780,7 +19932,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19789,13 +19941,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -19917,7 +20069,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19926,13 +20078,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -20054,10 +20206,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20066,19 +20218,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -20285,10 +20437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20297,19 +20449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -20495,10 +20647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20507,19 +20659,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "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",
@@ -20668,10 +20820,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20680,19 +20832,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1083",
    "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",
@@ -20820,13 +20972,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -20968,12 +21120,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -20983,18 +21135,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -21004,13 +21156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -21123,7 +21275,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21132,13 +21284,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -21260,10 +21412,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21272,19 +21424,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -21494,10 +21646,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21506,19 +21658,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "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",
@@ -21670,13 +21822,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -21821,7 +21973,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21830,13 +21982,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -21958,7 +22110,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21967,13 +22119,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -22095,10 +22247,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22107,19 +22259,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -22305,10 +22457,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22317,19 +22469,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -22554,10 +22706,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22566,19 +22718,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "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",
@@ -22706,10 +22858,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22718,19 +22870,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "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",
@@ -22897,13 +23049,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -23016,13 +23168,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -23189,17 +23341,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-545"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-534" ],
+   "template_args" : [ "type-546" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -23209,17 +23361,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-503" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -23229,17 +23381,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-952" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -23249,17 +23401,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-440"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-431" ],
+   "template_args" : [ "type-442" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -23269,17 +23421,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-938" ],
+   "template_args" : [ "type-959" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -23289,17 +23441,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -23309,17 +23461,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -23329,17 +23481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-617"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-610" ],
+   "template_args" : [ "type-622" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -23349,157 +23501,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-917",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-353" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-356" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-366"
+    }
+   ],
+   "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-937",
+   "self_type" : "type-937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-358" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-360"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-361" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -23509,69 +23661,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23581,52 +23733,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23636,8 +23788,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23647,85 +23799,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-550",
+   "self_type" : "type-550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23735,52 +23887,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23790,8 +23942,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23801,85 +23953,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23889,52 +24041,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-686",
+   "self_type" : "type-686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23944,8 +24096,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-732",
+   "self_type" : "type-732",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23955,107 +24107,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-320" ],
+   "template_args" : [ "type-325" ],
    "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-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-317" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-562",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -24065,52 +24217,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -24120,8 +24272,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-734",
+   "self_type" : "type-734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -24131,33 +24283,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-650",
+   "self_type" : "type-650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -24167,23 +24319,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -24193,23 +24345,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-930",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-914" ],
+   "template_args" : [ "type-934" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -24219,23 +24371,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -24245,23 +24397,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -24270,18 +24422,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -24297,18 +24449,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-466"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -24319,7 +24471,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-462"
     },
     {
      "field_name" : "num_planes",
@@ -24329,13 +24481,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-453"
+     "referenced_type" : "type-464"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -24346,12 +24498,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-461"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bits_per_component",
@@ -24386,8 +24538,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -24398,38 +24550,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -24440,18 +24592,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -24462,17 +24614,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "ystride",
@@ -24492,13 +24644,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -24508,13 +24660,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -24525,35 +24677,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-350"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-345"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-344"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-342"
     }
    ],
    "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-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "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)"
@@ -24574,8 +24726,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -24586,12 +24738,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24616,13 +24768,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-342",
+   "self_type" : "type-342",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -24633,12 +24785,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24668,13 +24820,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -24685,12 +24837,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24720,13 +24872,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -24737,12 +24889,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24777,13 +24929,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -24827,8 +24979,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24836,8 +24988,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24845,8 +24997,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-954",
-   "self_type" : "type-957",
+   "referenced_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24854,8 +25006,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-1073",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24863,8 +25015,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-1144",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24872,8 +25024,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-1213",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24881,8 +25033,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-1291",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24890,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-283",
+   "referenced_type" : "type-151",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24899,8 +25051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-394",
+   "referenced_type" : "type-19",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24909,7 +25061,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-707",
+   "self_type" : "type-723",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24917,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-687",
+   "referenced_type" : "type-419",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -24926,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-324",
+   "referenced_type" : "type-20",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24935,8 +25087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-268",
-   "self_type" : "type-278",
+   "referenced_type" : "type-273",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24944,8 +25096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-276",
-   "self_type" : "type-282",
+   "referenced_type" : "type-281",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24953,8 +25105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24962,8 +25114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-502",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24971,8 +25123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-428",
-   "self_type" : "type-515",
+   "referenced_type" : "type-439",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24980,8 +25132,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-917",
-   "self_type" : "type-949",
+   "referenced_type" : "type-937",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24989,8 +25141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-507",
+   "referenced_type" : "type-505",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24998,8 +25150,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-85",
-   "self_type" : "type-592",
+   "referenced_type" : "type-94",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25007,8 +25159,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-181",
-   "self_type" : "type-942",
+   "referenced_type" : "type-188",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25016,8 +25168,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-61",
-   "self_type" : "type-946",
+   "referenced_type" : "type-68",
+   "self_type" : "type-969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25025,8 +25177,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25034,8 +25186,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-70",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25043,8 +25195,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25052,8 +25204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-379",
-   "self_type" : "type-389",
+   "referenced_type" : "type-384",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25061,8 +25213,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-359",
-   "self_type" : "type-686",
+   "referenced_type" : "type-364",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25070,8 +25222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-377",
-   "self_type" : "type-388",
+   "referenced_type" : "type-382",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25079,8 +25231,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-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25088,8 +25240,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-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25097,8 +25249,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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25106,8 +25258,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-1244",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25115,8 +25267,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-1325",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25124,8 +25276,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25133,8 +25285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25142,8 +25294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25151,8 +25303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25160,8 +25312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25169,8 +25321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25178,8 +25330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25187,8 +25339,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25196,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25205,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25214,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25223,8 +25375,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25232,8 +25384,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/arm64_armv8-a/source-based/libhidltransport.so.lsdump b/Q/64/arm64_armv8-a/source-based/libhidltransport.so.lsdump
index c202208..aa140e2 100644
--- a/Q/64/arm64_armv8-a/source-based/libhidltransport.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-338",
+   "referenced_type" : "type-146",
+   "self_type" : "type-343",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [64]",
+   "name" : "char [64]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-410",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-39",
-   "self_type" : "type-455",
+   "referenced_type" : "type-25",
+   "self_type" : "type-466",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-982",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1003",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-345",
+   "referenced_type" : "type-103",
+   "self_type" : "type-350",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-447",
+   "self_type" : "type-458",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -70,8 +79,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -80,24 +89,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -114,8 +123,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -123,8 +132,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 8
   },
   {
@@ -132,8 +141,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -141,8 +150,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -151,8 +160,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -181,8 +190,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 8
   },
   {
@@ -191,15 +200,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1777,10 +1786,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEmRKT_"
   },
   {
@@ -1789,10 +1794,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1829,10 +1830,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1845,14 +1842,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2679,8 +2668,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2697,8 +2686,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2715,8 +2704,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2741,8 +2730,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2771,8 +2760,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2793,8 +2782,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2847,8 +2836,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2901,8 +2890,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2927,8 +2916,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2945,8 +2934,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/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-2",
@@ -2971,11 +2960,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3021,8 +3010,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3075,8 +3064,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3101,8 +3090,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3143,8 +3132,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3385,8 +3374,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3415,8 +3404,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3445,8 +3434,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3487,8 +3476,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3525,8 +3514,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3551,8 +3540,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3569,8 +3558,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3599,8 +3588,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3693,8 +3682,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-443",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3735,8 +3724,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3753,8 +3742,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3783,8 +3772,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3817,8 +3806,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3871,8 +3860,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3888,12 +3877,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     }
    ],
-   "referenced_type" : "type-459",
+   "referenced_type" : "type-470",
    "return_type" : "type-2",
-   "self_type" : "type-459",
+   "self_type" : "type-470",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3906,10 +3895,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3919,10 +3908,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-78"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3932,16 +3921,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3951,13 +3940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1613"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3967,13 +3956,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1614"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3983,13 +3972,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3999,13 +3988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1615"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4015,13 +4004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1616"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4031,10 +4020,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4044,10 +4033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4057,10 +4046,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4070,16 +4059,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4088,14 +4077,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4106,13 +4095,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4122,13 +4111,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4138,13 +4127,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4153,16 +4142,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1599"
+     "referenced_type" : "type-1622"
     }
    ],
    "return_type" : "type-2",
@@ -4175,16 +4164,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
      "default_arg" : true,
@@ -4192,7 +4181,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1623"
     }
    ],
    "return_type" : "type-2",
@@ -4204,16 +4193,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1624"
     }
    ],
    "return_type" : "type-2",
@@ -4227,13 +4216,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1625"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4242,16 +4231,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1626"
     }
    ],
    "return_type" : "type-2",
@@ -4263,16 +4252,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1627"
     }
    ],
    "return_type" : "type-2",
@@ -4284,16 +4273,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1628"
     }
    ],
    "return_type" : "type-2",
@@ -4305,16 +4294,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1629"
     }
    ],
    "return_type" : "type-2",
@@ -4326,16 +4315,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1630"
     }
    ],
    "return_type" : "type-2",
@@ -4349,10 +4338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4362,13 +4351,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4378,19 +4367,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4400,13 +4389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4416,19 +4405,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4438,10 +4427,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4451,10 +4440,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4464,10 +4453,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4476,13 +4465,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4491,19 +4480,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4513,16 +4502,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4532,13 +4521,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1631"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4548,13 +4537,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1632"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4564,13 +4553,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4580,13 +4569,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1633"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4595,16 +4584,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1634"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4613,16 +4602,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1635"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4632,13 +4621,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1636"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4647,16 +4636,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1637"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4666,10 +4655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4679,10 +4668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4691,16 +4680,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1638"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4709,13 +4698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4724,13 +4713,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4740,10 +4729,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4753,16 +4742,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4772,13 +4761,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4788,13 +4777,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4804,14 +4793,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4821,16 +4810,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4840,13 +4829,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1639"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4856,13 +4845,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1640"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4872,14 +4861,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4889,13 +4878,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4905,13 +4894,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4921,11 +4910,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     }
    ],
    "return_type" : "type-2",
@@ -4938,13 +4927,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4954,10 +4943,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4967,10 +4956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4979,13 +4968,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4995,10 +4984,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5008,16 +4997,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5026,14 +5015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5042,14 +5031,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5060,13 +5049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1645"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5076,13 +5065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5092,13 +5081,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5107,16 +5096,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1651"
     }
    ],
    "return_type" : "type-2",
@@ -5129,16 +5118,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
      "default_arg" : true,
@@ -5146,7 +5135,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1652"
     }
    ],
    "return_type" : "type-2",
@@ -5160,13 +5149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1653"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5175,16 +5164,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1654"
     }
    ],
    "return_type" : "type-2",
@@ -5196,16 +5185,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1655"
     }
    ],
    "return_type" : "type-2",
@@ -5217,16 +5206,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1656"
     }
    ],
    "return_type" : "type-2",
@@ -5238,16 +5227,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1657"
     }
    ],
    "return_type" : "type-2",
@@ -5259,16 +5248,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1635"
+     "referenced_type" : "type-1658"
     }
    ],
    "return_type" : "type-2",
@@ -5282,10 +5271,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5294,16 +5283,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-1659"
     }
    ],
    "return_type" : "type-2",
@@ -5315,16 +5304,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1637"
+     "referenced_type" : "type-1660"
     }
    ],
    "return_type" : "type-2",
@@ -5337,13 +5326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5353,13 +5342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5369,10 +5358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5382,10 +5371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5395,10 +5384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5407,16 +5396,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1661"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5426,16 +5415,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5445,13 +5434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1639"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5461,13 +5450,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5477,16 +5466,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5496,13 +5485,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5512,13 +5501,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5527,16 +5516,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5546,16 +5535,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5564,19 +5553,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5586,13 +5575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5601,19 +5590,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5623,10 +5612,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5636,10 +5625,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5649,19 +5638,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5671,16 +5660,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5689,22 +5678,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5713,19 +5702,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5735,16 +5724,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5754,16 +5743,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5773,13 +5762,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5789,10 +5778,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5802,16 +5791,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5820,19 +5809,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5841,19 +5830,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5863,13 +5852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5879,13 +5868,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5895,13 +5884,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5911,14 +5900,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5928,16 +5917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5947,13 +5936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5963,13 +5952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5979,14 +5968,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5996,13 +5985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6012,13 +6001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6028,11 +6017,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     }
    ],
    "return_type" : "type-2",
@@ -6045,13 +6034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1651"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6061,10 +6050,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6074,10 +6063,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6086,13 +6075,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6102,10 +6091,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6115,16 +6104,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6133,14 +6122,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "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"
   },
   {
@@ -6149,14 +6138,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "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"
   },
   {
@@ -6167,13 +6156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-1677"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6183,13 +6172,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6199,13 +6188,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6214,10 +6203,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1047"
+     "referenced_type" : "type-1065"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-12"
@@ -6235,10 +6224,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1047"
+     "referenced_type" : "type-1065"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
      "referenced_type" : "type-12"
@@ -6257,16 +6246,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1136"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
      "default_arg" : true,
@@ -6274,7 +6263,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1680"
     }
    ],
    "return_type" : "type-2",
@@ -6288,13 +6277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1681"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6303,16 +6292,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1136"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1682"
     }
    ],
    "return_type" : "type-2",
@@ -6326,10 +6315,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6339,13 +6328,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6355,13 +6344,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6371,10 +6360,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6384,10 +6373,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6397,10 +6386,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6410,16 +6399,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6429,13 +6418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1683"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6445,13 +6434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6461,13 +6450,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6477,13 +6466,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6493,19 +6482,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6515,13 +6504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6530,22 +6519,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6555,10 +6544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6568,10 +6557,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6581,10 +6570,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6594,16 +6583,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6613,13 +6602,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6629,13 +6618,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6645,14 +6634,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6662,16 +6651,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6681,13 +6670,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6697,13 +6686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6713,14 +6702,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6730,13 +6719,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6746,13 +6735,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6762,11 +6751,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     }
    ],
    "return_type" : "type-2",
@@ -6779,13 +6768,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6795,10 +6784,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6808,10 +6797,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6820,13 +6809,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6836,10 +6825,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6849,16 +6838,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6867,14 +6856,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6883,14 +6872,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6899,14 +6888,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6917,13 +6906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-1670"
+     "referenced_type" : "type-1693"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6933,13 +6922,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6949,13 +6938,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6965,16 +6954,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1203"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
      "default_arg" : true,
@@ -6982,7 +6971,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1699"
     }
    ],
    "return_type" : "type-2",
@@ -6996,13 +6985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1700"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7011,16 +7000,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1203"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1701"
     }
    ],
    "return_type" : "type-2",
@@ -7034,10 +7023,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7047,13 +7036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7063,13 +7052,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7079,10 +7068,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7092,10 +7081,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7105,10 +7094,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7118,16 +7107,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7137,13 +7126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1702"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7153,13 +7142,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7169,16 +7158,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7188,13 +7177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7204,13 +7193,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7220,16 +7209,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7239,13 +7228,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7255,10 +7244,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7268,10 +7257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7281,19 +7270,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7303,16 +7292,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7322,19 +7311,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7343,22 +7332,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1157"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7368,16 +7357,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7387,16 +7376,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7406,13 +7395,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7422,10 +7411,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7435,16 +7424,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7454,13 +7443,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7470,13 +7459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7486,13 +7475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7502,14 +7491,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7519,16 +7508,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7538,13 +7527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1709"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7554,13 +7543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1710"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7570,14 +7559,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7587,13 +7576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7603,13 +7592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1711"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7619,11 +7608,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     }
    ],
    "return_type" : "type-2",
@@ -7636,13 +7625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7652,10 +7641,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7665,10 +7654,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7677,13 +7666,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7693,10 +7682,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7706,16 +7695,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7724,14 +7713,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "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"
   },
   {
@@ -7740,14 +7729,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "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"
   },
   {
@@ -7757,14 +7746,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7774,16 +7763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7793,13 +7782,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1713"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7809,13 +7798,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1714"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7825,14 +7814,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7842,13 +7831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7858,13 +7847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1715"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7874,11 +7863,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     }
    ],
    "return_type" : "type-2",
@@ -7891,13 +7880,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7907,10 +7896,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7920,10 +7909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7932,13 +7921,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7948,10 +7937,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7961,16 +7950,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7979,14 +7968,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -7995,14 +7984,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -8011,14 +8000,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -8027,14 +8016,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -8045,13 +8034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1696"
+     "referenced_type" : "type-1719"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8061,13 +8050,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8077,13 +8066,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8094,13 +8083,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-1701"
+     "referenced_type" : "type-1724"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8110,13 +8099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8126,13 +8115,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8142,16 +8131,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1280"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
      "default_arg" : true,
@@ -8159,7 +8148,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1708"
+     "referenced_type" : "type-1731"
     }
    ],
    "return_type" : "type-2",
@@ -8173,13 +8162,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1732"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8188,16 +8177,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1280"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1733"
     }
    ],
    "return_type" : "type-2",
@@ -8211,10 +8200,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8224,13 +8213,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8240,13 +8229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8256,10 +8245,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8269,10 +8258,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8282,10 +8271,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8295,16 +8284,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
      "default_arg" : true,
@@ -8312,7 +8301,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-1734"
     }
    ],
    "return_type" : "type-2",
@@ -8326,13 +8315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-1735"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8341,16 +8330,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-1736"
     }
    ],
    "return_type" : "type-2",
@@ -8362,16 +8351,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1714"
+     "referenced_type" : "type-1737"
     }
    ],
    "return_type" : "type-2",
@@ -8383,16 +8372,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1715"
+     "referenced_type" : "type-1738"
     }
    ],
    "return_type" : "type-2",
@@ -8404,16 +8393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1716"
+     "referenced_type" : "type-1739"
     }
    ],
    "return_type" : "type-2",
@@ -8425,16 +8414,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1717"
+     "referenced_type" : "type-1740"
     }
    ],
    "return_type" : "type-2",
@@ -8448,10 +8437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8461,13 +8450,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8477,13 +8466,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8493,10 +8482,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8506,10 +8495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8519,10 +8508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8532,16 +8521,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8551,13 +8540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1718"
+     "referenced_type" : "type-1741"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8567,13 +8556,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8583,13 +8572,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8599,13 +8588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8614,19 +8603,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1224"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8636,13 +8625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1721"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8652,10 +8641,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8665,10 +8654,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8678,10 +8667,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8691,16 +8680,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8710,16 +8699,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8729,13 +8718,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8745,13 +8734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8761,16 +8750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8780,19 +8769,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8802,13 +8791,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1722"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8818,13 +8807,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1723"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8834,16 +8823,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8853,19 +8842,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8875,13 +8864,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8891,13 +8880,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1747"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8907,16 +8896,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1725"
+     "referenced_type" : "type-1748"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8925,22 +8914,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8949,22 +8938,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8974,13 +8963,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1726"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8990,10 +8979,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9003,10 +8992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9016,22 +9005,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9041,16 +9030,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9060,19 +9049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9082,16 +9071,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9101,16 +9090,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9120,19 +9109,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9141,25 +9130,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9168,19 +9157,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-1751"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9189,19 +9178,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9211,16 +9200,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9230,16 +9219,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9249,13 +9238,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9265,10 +9254,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9278,16 +9267,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9297,13 +9286,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9313,13 +9302,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9329,13 +9318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9344,12 +9333,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-406", "type-153" ]
+   "template_args" : [ "type-31", "type-420", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9357,12 +9346,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9370,12 +9359,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-70", "type-202", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9383,12 +9372,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9396,10 +9385,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-375"
     }
    ],
    "return_type" : "type-2",
@@ -9411,10 +9400,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-561"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     }
    ],
    "return_type" : "type-2",
@@ -9426,10 +9415,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
    "return_type" : "type-2",
@@ -9441,10 +9430,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-291",
+   "return_type" : "type-296",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9453,13 +9442,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9474,19 +9463,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9495,10 +9484,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-377"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9526,14 +9515,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-576"
     }
    ],
    "return_type" : "type-2",
@@ -9546,10 +9535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9559,16 +9548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9577,7 +9566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "referenced_type" : "type-2"
@@ -9586,7 +9575,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9601,10 +9590,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9622,10 +9611,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9643,10 +9632,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9667,10 +9656,10 @@
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9679,10 +9668,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9700,10 +9689,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9721,10 +9710,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9742,28 +9731,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-428",
+   "return_type" : "type-439",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9773,13 +9762,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-369"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9789,10 +9778,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
-   "return_type" : "type-354",
+   "return_type" : "type-359",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9802,19 +9791,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9824,19 +9813,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9848,22 +9837,22 @@
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9872,18 +9861,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9891,18 +9880,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9910,18 +9899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9929,18 +9918,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9948,18 +9937,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-70", "type-24", "type-202" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9967,18 +9956,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9986,18 +9975,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10005,18 +9994,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -10024,10 +10013,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-749",
+   "return_type" : "type-764",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10036,12 +10025,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10049,25 +10038,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
-  },
-  {
-   "function_name" : "android::hardware::details::wrapPassthrough",
-   "linker_set_key" : "_ZN7android8hardware7details15wrapPassthroughINS_4hidl7manager4V1_215IClientCallbackEvEENS_2spIT_EES9_",
-   "parameters" :
-   [
-    {
      "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-70", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
+  },
+  {
+   "function_name" : "android::hardware::details::wrapPassthrough",
+   "linker_set_key" : "_ZN7android8hardware7details15wrapPassthroughINS_4hidl7manager4V1_215IClientCallbackEvEENS_2spIT_EES9_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-75"
+    }
+   ],
+   "return_type" : "type-75",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10075,17 +10064,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10100,13 +10089,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10115,18 +10104,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10134,18 +10123,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10153,18 +10142,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10172,18 +10161,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-70", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10191,29 +10180,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10222,19 +10211,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10243,10 +10232,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10255,10 +10244,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10267,10 +10256,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10282,79 +10271,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-763",
+   "referenced_type" : "type-778",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-764",
+   "referenced_type" : "type-779",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-374",
+   "referenced_type" : "type-409",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10364,8 +10353,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-466",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10373,8 +10362,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-476",
+   "referenced_type" : "type-483",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10382,8 +10371,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-329",
+   "referenced_type" : "type-325",
+   "self_type" : "type-334",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10391,17 +10380,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-317",
+   "referenced_type" : "type-317",
+   "self_type" : "type-322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.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-696",
+   "self_type" : "type-708",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-702",
+   "self_type" : "type-711",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10409,8 +10416,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10418,8 +10425,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10427,8 +10434,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10436,8 +10443,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10445,8 +10452,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10454,8 +10461,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-953",
-   "self_type" : "type-957",
+   "referenced_type" : "type-976",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10463,8 +10470,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-1072",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1096",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10472,8 +10479,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-1143",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10481,8 +10488,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-1212",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10490,8 +10497,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-1290",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1315",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10499,8 +10506,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-294",
+   "referenced_type" : "type-151",
+   "self_type" : "type-299",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10508,8 +10515,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-400",
+   "referenced_type" : "type-19",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10526,8 +10533,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-978",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1067",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10535,8 +10542,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-626",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1063",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10544,8 +10551,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10553,8 +10560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10562,8 +10569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-981",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10571,8 +10578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-281",
+   "referenced_type" : "type-281",
+   "self_type" : "type-286",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10580,8 +10587,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1064",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10589,8 +10596,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-977",
-   "self_type" : "type-987",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1007",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10598,8 +10605,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-625",
-   "self_type" : "type-976",
+   "referenced_type" : "type-636",
+   "self_type" : "type-997",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10607,8 +10614,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-632",
-   "self_type" : "type-636",
+   "referenced_type" : "type-644",
+   "self_type" : "type-647",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10616,8 +10623,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10625,8 +10632,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-164",
+   "referenced_type" : "type-140",
+   "self_type" : "type-171",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10634,8 +10641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-518",
+   "referenced_type" : "type-439",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10643,8 +10650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10652,8 +10659,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-916",
-   "self_type" : "type-949",
+   "referenced_type" : "type-936",
+   "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10661,8 +10668,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-85",
-   "self_type" : "type-661",
+   "referenced_type" : "type-94",
+   "self_type" : "type-675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10670,8 +10677,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-181",
-   "self_type" : "type-942",
+   "referenced_type" : "type-188",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10679,8 +10686,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-61",
-   "self_type" : "type-944",
+   "referenced_type" : "type-68",
+   "self_type" : "type-966",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10688,8 +10695,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-20",
-   "self_type" : "type-37",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10697,8 +10704,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-68",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10706,8 +10713,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10715,8 +10722,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-379",
-   "self_type" : "type-501",
+   "referenced_type" : "type-384",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10724,8 +10731,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-359",
-   "self_type" : "type-485",
+   "referenced_type" : "type-364",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10733,8 +10740,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
+   "referenced_type" : "type-331",
+   "self_type" : "type-333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10742,8 +10749,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-316",
+   "referenced_type" : "type-319",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10751,8 +10758,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10760,8 +10767,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1136",
    "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"
   },
@@ -10769,8 +10776,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1203",
    "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"
   },
@@ -10778,8 +10785,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10787,8 +10794,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1280",
    "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"
   },
@@ -10796,8 +10803,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1336",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10805,8 +10812,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1393",
    "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"
   },
@@ -10814,8 +10821,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10823,8 +10830,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-960",
+   "referenced_type" : "type-552",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10832,8 +10839,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10841,8 +10848,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-93",
-   "self_type" : "type-551",
+   "referenced_type" : "type-90",
+   "self_type" : "type-561",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10850,8 +10857,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10859,8 +10866,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10868,8 +10875,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-298",
-   "self_type" : "type-299",
+   "referenced_type" : "type-303",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10877,8 +10884,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-279",
-   "self_type" : "type-280",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10886,8 +10893,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-279",
+   "self_type" : "type-280",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10895,8 +10902,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-1362",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1396",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10904,8 +10911,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-630",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-642",
+   "self_type" : "type-1033",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10913,8 +10920,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-991",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10922,8 +10929,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-637",
-   "self_type" : "type-639",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10931,8 +10938,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-554",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10940,8 +10947,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10949,8 +10956,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-392",
-   "self_type" : "type-393",
+   "referenced_type" : "type-397",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10958,8 +10965,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-990",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1065",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10967,8 +10974,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-519",
-   "self_type" : "type-705",
+   "referenced_type" : "type-530",
+   "self_type" : "type-728",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10976,8 +10983,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10985,8 +10992,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-915",
-   "self_type" : "type-918",
+   "referenced_type" : "type-935",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10994,8 +11001,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-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11003,8 +11010,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-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11012,8 +11019,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11021,24 +11028,6 @@
    "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-60",
-   "self_type" : "type-59",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-30",
-   "self_type" : "type-29",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-67",
    "self_type" : "type-66",
    "size" : 8,
@@ -11046,10 +11035,28 @@
   },
   {
    "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-37",
+   "self_type" : "type-36",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-74",
+   "self_type" : "type-73",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11057,8 +11064,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-499",
-   "self_type" : "type-500",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11066,8 +11073,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1206",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11075,8 +11082,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-362",
-   "self_type" : "type-364",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11084,8 +11091,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-490",
-   "self_type" : "type-491",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11093,8 +11100,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-486",
-   "self_type" : "type-702",
+   "referenced_type" : "type-497",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11102,8 +11109,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-106",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11111,8 +11118,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11120,8 +11127,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11129,79 +11136,72 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-162",
-   "self_type" : "type-165",
+   "referenced_type" : "type-158",
+   "self_type" : "type-166",
    "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-1086",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1107",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1178",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-118",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1246",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1325",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1377",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1423",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1489",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1528",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11214,79 +11214,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
+   "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-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-547",
-   "self_type" : "type-549",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-558",
+   "self_type" : "type-560",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-633",
+   "self_type" : "type-635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-686",
+   "self_type" : "type-688",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
+   "referenced_type" : "type-739",
+   "self_type" : "type-741",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-887",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-986",
+   "referenced_type" : "type-908",
+   "self_type" : "type-910",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-970",
-   "self_type" : "type-972",
+   "referenced_type" : "type-985",
+   "self_type" : "type-990",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-991",
+   "self_type" : "type-993",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-351",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11294,8 +11301,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-206",
+   "referenced_type" : "type-177",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11303,8 +11310,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11312,8 +11319,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-119",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11321,8 +11328,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-1014",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1040",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11330,8 +11337,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-1097",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1119",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11339,8 +11346,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-1167",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1188",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11348,8 +11355,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-1235",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1258",
+   "self_type" : "type-1260",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11357,8 +11364,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-1288",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11366,8 +11373,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-1318",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11375,8 +11382,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-1366",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1390",
    "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"
   },
@@ -11384,278 +11391,125 @@
    "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-1476",
-   "self_type" : "type-1478",
-   "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-1544",
-   "self_type" : "type-1546",
-   "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-155",
-   "self_type" : "type-157",
-   "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-401",
-   "self_type" : "type-403",
-   "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-562",
-   "self_type" : "type-564",
-   "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-650",
-   "self_type" : "type-652",
-   "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-832",
-   "self_type" : "type-834",
-   "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-1540",
-   "self_type" : "type-1539",
-   "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-645",
-   "self_type" : "type-644",
-   "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-1281",
-   "self_type" : "type-1280",
-   "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-396",
-   "self_type" : "type-395",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
-   "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
-   "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-820",
-   "self_type" : "type-822",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1054",
-   "self_type" : "type-1053",
-   "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-1122",
-   "self_type" : "type-1121",
-   "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-1187",
-   "self_type" : "type-1186",
-   "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-1240",
-   "self_type" : "type-1239",
-   "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-1263",
-   "self_type" : "type-1262",
-   "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-1335",
-   "self_type" : "type-1334",
-   "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-1389",
-   "self_type" : "type-1388",
-   "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-1408",
-   "self_type" : "type-1407",
-   "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-1498",
-   "self_type" : "type-1497",
+   "self_type" : "type-1500",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-1550",
-   "self_type" : "type-1549",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1568",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-1572",
-   "self_type" : "type-1571",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-162",
+   "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-1588",
-   "self_type" : "type-1587",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-406",
+   "self_type" : "type-408",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-213",
-   "self_type" : "type-212",
+   "linker_set_key" : "const std::basic_string<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-576",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-257",
-   "self_type" : "type-256",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-661",
+   "self_type" : "type-663",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-385",
-   "self_type" : "type-384",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-854",
+   "self_type" : "type-856",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-589",
-   "self_type" : "type-588",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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 *> > *)> > > &",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
    "referenced_type" : "type-657",
    "self_type" : "type-656",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-1291",
+   "self_type" : "type-1290",
+   "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-401",
+   "self_type" : "type-400",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
+   "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-842",
+   "self_type" : "type-844",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11663,8 +11517,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-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11672,8 +11526,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-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11681,8 +11535,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-902",
-   "self_type" : "type-901",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "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-1284",
+   "self_type" : "type-1283",
+   "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-1357",
+   "self_type" : "type-1356",
+   "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-1411",
+   "self_type" : "type-1410",
+   "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-1430",
+   "self_type" : "type-1429",
+   "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-1520",
+   "self_type" : "type-1519",
+   "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-1574",
+   "self_type" : "type-1573",
+   "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-16",
+   "self_type" : "type-15",
+   "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-1600",
+   "self_type" : "type-1599",
+   "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-220",
+   "self_type" : "type-219",
+   "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-266",
+   "self_type" : "type-265",
+   "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-390",
+   "self_type" : "type-389",
+   "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-601",
+   "self_type" : "type-600",
+   "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-672",
+   "self_type" : "type-671",
+   "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-720",
+   "self_type" : "type-719",
+   "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-784",
+   "self_type" : "type-783",
+   "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-889",
+   "self_type" : "type-888",
+   "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-923",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11690,8 +11697,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11700,7 +11707,7 @@
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-170",
-   "self_type" : "type-178",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11708,8 +11715,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11717,8 +11724,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11727,7 +11734,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-309",
+   "self_type" : "type-314",
    "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"
   },
@@ -11735,8 +11742,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-577",
+   "referenced_type" : "type-103",
+   "self_type" : "type-588",
    "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"
   }
@@ -11747,8 +11754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-471",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -11756,8 +11763,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
+   "referenced_type" : "type-473",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11765,8 +11772,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-467",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11774,8 +11781,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-474",
+   "referenced_type" : "type-483",
+   "self_type" : "type-485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11783,8 +11790,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-477",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11792,8 +11799,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11801,8 +11808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11810,8 +11817,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11819,8 +11826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11828,8 +11835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11837,8 +11844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11846,8 +11853,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11855,8 +11862,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11864,8 +11871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11873,8 +11880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11882,17 +11889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "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-1556",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11909,8 +11907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11918,8 +11916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11927,8 +11925,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11936,8 +11934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11945,8 +11943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-669",
-   "self_type" : "type-668",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11954,8 +11952,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11963,8 +11961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-807",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11972,8 +11970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11981,8 +11979,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11990,8 +11988,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
+   "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-988",
+   "self_type" : "type-987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11999,8 +12006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12008,8 +12015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12017,8 +12024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -12026,8 +12033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-320",
-   "self_type" : "type-330",
+   "referenced_type" : "type-325",
+   "self_type" : "type-335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12035,8 +12042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-312",
-   "self_type" : "type-318",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12044,8 +12051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12053,8 +12060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-494",
+   "referenced_type" : "type-418",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -12062,8 +12069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12071,8 +12078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12080,8 +12087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12089,8 +12096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12098,8 +12105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12107,8 +12114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12116,8 +12123,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12125,8 +12132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "type-386",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12134,8 +12141,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12143,8 +12150,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12152,8 +12159,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12161,8 +12168,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12170,8 +12177,8 @@
    "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-681",
-   "self_type" : "type-684",
+   "referenced_type" : "type-696",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12179,8 +12186,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-687",
-   "self_type" : "type-690",
+   "referenced_type" : "type-702",
+   "self_type" : "type-705",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12188,8 +12195,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-374",
-   "self_type" : "type-387",
+   "referenced_type" : "type-379",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12197,8 +12204,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-245",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-252",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12206,8 +12213,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-239",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-246",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12224,8 +12231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12233,8 +12240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12242,8 +12249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12251,8 +12258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12260,8 +12267,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12269,8 +12276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12278,8 +12285,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12287,8 +12294,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12296,8 +12303,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12305,8 +12312,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12314,8 +12321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12323,8 +12330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12332,8 +12339,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12341,8 +12348,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12350,8 +12357,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12359,8 +12366,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-704",
-   "self_type" : "type-703",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12368,8 +12375,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-894",
+   "self_type" : "type-893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12377,8 +12384,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12386,8 +12393,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12395,8 +12402,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12404,8 +12411,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12413,8 +12420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12422,8 +12429,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12431,8 +12438,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12440,8 +12447,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12449,8 +12456,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12458,8 +12465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12467,8 +12474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12476,8 +12483,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12485,8 +12492,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12494,8 +12501,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12503,8 +12510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-561",
+   "referenced_type" : "type-570",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -12512,8 +12519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1035",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12521,8 +12528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "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"
   },
@@ -12530,26 +12537,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
-   "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-1205",
    "self_type" : "type-1204",
    "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-1214",
+   "self_type" : "type-1213",
+   "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-1259",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "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"
   },
@@ -12557,8 +12564,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12566,8 +12573,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
    "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"
   },
@@ -12575,8 +12582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12584,8 +12591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12593,8 +12600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12602,8 +12609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12611,8 +12618,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12620,8 +12627,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +12636,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12638,8 +12645,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12647,8 +12654,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12656,8 +12663,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-219",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12665,8 +12672,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12674,8 +12681,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-874",
-   "self_type" : "type-873",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12683,8 +12690,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12692,8 +12699,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12701,8 +12708,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12710,8 +12717,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-953",
-   "self_type" : "type-954",
+   "referenced_type" : "type-976",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12719,8 +12726,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-1072",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12728,8 +12735,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-1143",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12737,8 +12744,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-1212",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12746,8 +12753,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-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1313",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12755,8 +12762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-273",
+   "referenced_type" : "type-151",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12764,8 +12771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-383",
+   "referenced_type" : "type-19",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12774,7 +12781,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-537",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12782,8 +12789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12791,17 +12798,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-707",
+   "self_type" : "type-709",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-710",
+   "self_type" : "type-712",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-409",
+   "self_type" : "type-411",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-664",
+   "self_type" : "type-667",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-413",
+   "self_type" : "type-415",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-405",
+   "referenced_type" : "type-56",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12809,8 +12861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-72",
+   "self_type" : "type-71",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12818,8 +12870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12827,8 +12879,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-978",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1066",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12836,8 +12888,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-626",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12845,8 +12897,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-131",
-   "self_type" : "type-159",
+   "referenced_type" : "type-137",
+   "self_type" : "type-165",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12854,8 +12906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12863,8 +12915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-305",
+   "referenced_type" : "type-20",
+   "self_type" : "type-310",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12872,8 +12924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12881,8 +12933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-358",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12890,8 +12942,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12899,8 +12951,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-277",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12908,8 +12960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-628",
+   "referenced_type" : "type-141",
+   "self_type" : "type-639",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12917,8 +12969,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-977",
-   "self_type" : "type-983",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12926,8 +12978,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-625",
-   "self_type" : "type-973",
+   "referenced_type" : "type-636",
+   "self_type" : "type-994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12935,8 +12987,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-130",
-   "self_type" : "type-142",
+   "referenced_type" : "type-136",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12944,8 +12996,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-632",
-   "self_type" : "type-634",
+   "referenced_type" : "type-644",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12953,8 +13005,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12962,8 +13014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-291",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12971,8 +13023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-333",
+   "referenced_type" : "type-160",
+   "self_type" : "type-338",
    "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"
   },
@@ -12980,8 +13032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-926",
+   "referenced_type" : "type-420",
+   "self_type" : "type-949",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12989,8 +13041,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12998,8 +13050,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13007,8 +13059,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "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"
   },
@@ -13016,8 +13068,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "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"
   },
@@ -13025,8 +13077,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-925",
+   "referenced_type" : "type-192",
+   "self_type" : "type-948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13034,8 +13086,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-943",
+   "referenced_type" : "type-181",
+   "self_type" : "type-965",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13043,8 +13095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-924",
+   "referenced_type" : "type-943",
+   "self_type" : "type-946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13052,8 +13104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13061,8 +13113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13070,8 +13122,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13079,105 +13131,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-193",
-   "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::hidl::manager::V1_1::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-1135",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
-   "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
-   "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::hidl::manager::V1_2::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
-   "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"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-1198",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1197",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1275",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
-   "name" : "android::hidl::manager::V1_2::IClientCallback *",
    "referenced_type" : "type-70",
    "self_type" : "type-69",
    "size" : 8,
@@ -13185,10 +13138,109 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "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::hidl::manager::V1_1::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1153",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1152",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
+   "name" : "android::hidl::manager::V1_1::IServiceManager *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
+   "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::hidl::manager::V1_2::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "referenced_type" : "type-209",
+   "self_type" : "type-1221",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1220",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1296",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
+   "name" : "android::hidl::manager::V1_2::IClientCallback *",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13196,8 +13248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13205,8 +13257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-930",
+   "referenced_type" : "type-950",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13214,8 +13266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-514",
+   "referenced_type" : "type-439",
+   "self_type" : "type-526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13223,8 +13275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-78",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13232,8 +13284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-529",
+   "referenced_type" : "type-536",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13241,8 +13293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13250,339 +13302,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-916",
-   "self_type" : "type-947",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-506",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-512",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-596",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-603",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-598",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-68",
-   "self_type" : "type-605",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-601",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-498",
-   "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-909",
-   "self_type" : "type-914",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-489",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "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-359",
-   "self_type" : "type-482",
-   "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-449",
-   "self_type" : "type-453",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-351",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-306",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-327",
-   "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-314",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-418",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1021",
-   "self_type" : "type-1022",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1023",
-   "self_type" : "type-1024",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-390",
-   "self_type" : "type-391",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-647",
-   "self_type" : "type-648",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-398",
-   "self_type" : "type-399",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1451",
-   "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-521",
-   "self_type" : "type-523",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-958",
-   "self_type" : "type-959",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1076",
-   "self_type" : "type-1077",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1147",
-   "self_type" : "type-1148",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1218",
-   "self_type" : "type-1219",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1295",
-   "self_type" : "type-1296",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-790",
-   "self_type" : "type-792",
-   "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-80",
    "self_type" : "type-82",
    "size" : 8,
@@ -13590,10 +13309,343 @@
   },
   {
    "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-936",
+   "self_type" : "type-969",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-505",
+   "self_type" : "type-517",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-524",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-607",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-614",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-610",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-612",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-509",
+   "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-929",
+   "self_type" : "type-934",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-501",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-364",
+   "self_type" : "type-490",
+   "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-460",
+   "self_type" : "type-464",
+   "size" : 8,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-356",
+   "size" : 8,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-331",
+   "self_type" : "type-332",
+   "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-319",
+   "self_type" : "type-320",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-429",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1043",
+   "self_type" : "type-1044",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1045",
+   "self_type" : "type-1046",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-395",
+   "self_type" : "type-396",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-659",
+   "self_type" : "type-660",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-403",
+   "self_type" : "type-404",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1473",
+   "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-533",
+   "self_type" : "type-535",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-980",
+   "self_type" : "type-981",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1097",
+   "self_type" : "type-1098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1167",
+   "self_type" : "type-1168",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1236",
+   "self_type" : "type-1237",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1316",
+   "self_type" : "type-1317",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-553",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-810",
+   "self_type" : "type-812",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-1050",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13601,8 +13653,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-654",
-   "self_type" : "type-655",
+   "referenced_type" : "type-669",
+   "self_type" : "type-670",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13610,8 +13662,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-161",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13619,8 +13671,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-567",
+   "referenced_type" : "type-132",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13628,8 +13680,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13637,8 +13689,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-1361",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13646,8 +13698,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-522",
+   "self_type" : "type-523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13655,8 +13707,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-284",
+   "referenced_type" : "type-284",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13664,8 +13716,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-629",
+   "referenced_type" : "type-279",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13673,8 +13725,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-1362",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13682,8 +13734,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-630",
-   "self_type" : "type-631",
+   "referenced_type" : "type-642",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13691,8 +13743,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-991",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1013",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13700,8 +13752,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-637",
-   "self_type" : "type-638",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13709,8 +13761,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-553",
+   "referenced_type" : "type-563",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13718,8 +13770,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-293",
+   "referenced_type" : "type-297",
+   "self_type" : "type-298",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13727,8 +13779,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-414",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
    "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"
   },
@@ -13736,8 +13788,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-383",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13745,8 +13797,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "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"
   },
@@ -13754,8 +13806,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "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"
   },
@@ -13763,8 +13815,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "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"
   },
@@ -13772,8 +13824,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-990",
-   "self_type" : "type-989",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13781,8 +13833,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-570",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "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"
   },
@@ -13790,8 +13842,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -13799,8 +13851,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "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"
   },
@@ -13808,8 +13860,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -13817,8 +13869,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -13826,8 +13878,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "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"
   },
@@ -13835,8 +13887,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "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"
   },
@@ -13844,15 +13896,6 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
-   "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-530",
    "self_type" : "type-531",
    "size" : 8,
@@ -13860,10 +13903,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
+   "name" : "const android::sp<android::hardware::ProcessState> *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-614",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13871,8 +13923,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13880,8 +13932,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-915",
-   "self_type" : "type-950",
+   "referenced_type" : "type-935",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13889,8 +13941,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-492",
-   "self_type" : "type-509",
+   "referenced_type" : "type-504",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13898,8 +13950,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-483",
-   "self_type" : "type-513",
+   "referenced_type" : "type-494",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13907,8 +13959,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-223",
-   "self_type" : "type-597",
+   "referenced_type" : "type-230",
+   "self_type" : "type-608",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13916,8 +13968,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-60",
-   "self_type" : "type-604",
+   "referenced_type" : "type-67",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13925,8 +13977,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-30",
-   "self_type" : "type-599",
+   "referenced_type" : "type-37",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13934,8 +13986,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-67",
-   "self_type" : "type-608",
+   "referenced_type" : "type-74",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13943,8 +13995,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-41",
-   "self_type" : "type-602",
+   "referenced_type" : "type-48",
+   "self_type" : "type-613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13952,8 +14004,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-504",
+   "referenced_type" : "type-511",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13961,8 +14013,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13970,8 +14022,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-486",
-   "self_type" : "type-487",
+   "referenced_type" : "type-497",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13979,8 +14031,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13988,8 +14040,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13997,8 +14049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-162",
-   "self_type" : "type-988",
+   "referenced_type" : "type-158",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14006,8 +14058,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-348",
+   "referenced_type" : "type-351",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14015,8 +14067,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14024,8 +14076,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-998",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14033,8 +14085,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-301",
+   "self_type" : "type-302",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14042,8 +14094,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-460",
+   "referenced_type" : "type-470",
+   "self_type" : "type-471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -14052,7 +14104,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14060,8 +14112,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-350",
+   "referenced_type" : "type-348",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14070,7 +14122,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14078,8 +14130,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-450",
+   "referenced_type" : "type-103",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -14088,7 +14140,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-12",
-   "self_type" : "type-1008",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14096,8 +14148,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-416",
+   "referenced_type" : "type-22",
+   "self_type" : "type-427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14105,8 +14157,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-416",
-   "self_type" : "type-461",
+   "referenced_type" : "type-427",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -14118,8 +14170,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14128,8 +14180,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1173",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14138,8 +14190,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14148,8 +14200,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14158,8 +14210,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14168,8 +14220,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14178,8 +14230,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1398",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14188,8 +14240,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14198,18 +14250,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1525",
-   "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-1555",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14228,8 +14270,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14238,8 +14280,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14248,8 +14290,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14258,8 +14300,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14268,8 +14310,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-668",
-   "self_type" : "type-670",
+   "referenced_type" : "type-629",
+   "self_type" : "type-631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14278,8 +14320,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14288,8 +14330,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-807",
-   "self_type" : "type-810",
+   "referenced_type" : "type-734",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14298,8 +14340,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-881",
-   "self_type" : "type-883",
+   "referenced_type" : "type-828",
+   "self_type" : "type-830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14308,8 +14350,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-902",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14318,8 +14360,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-965",
-   "self_type" : "type-967",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "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-987",
+   "self_type" : "type-989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14328,8 +14380,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -14338,8 +14390,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14348,8 +14400,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-320",
-   "self_type" : "type-326",
+   "referenced_type" : "type-325",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14358,8 +14410,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-312",
-   "self_type" : "type-314",
+   "referenced_type" : "type-317",
+   "self_type" : "type-319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14368,8 +14420,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-426",
+   "self_type" : "type-428",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14378,8 +14430,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-681",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-696",
+   "self_type" : "type-1043",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14388,8 +14440,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-687",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-702",
+   "self_type" : "type-1045",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14398,8 +14450,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-374",
-   "self_type" : "type-390",
+   "referenced_type" : "type-379",
+   "self_type" : "type-395",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14408,8 +14460,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-245",
-   "self_type" : "type-647",
+   "referenced_type" : "type-252",
+   "self_type" : "type-659",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14418,8 +14470,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<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-239",
-   "self_type" : "type-398",
+   "referenced_type" : "type-246",
+   "self_type" : "type-403",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14428,8 +14480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14438,8 +14490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14448,8 +14500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14458,8 +14510,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "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"
   },
@@ -14468,8 +14520,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1201",
    "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"
   },
@@ -14478,8 +14530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1210",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14488,8 +14540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "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"
   },
@@ -14498,8 +14550,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14508,8 +14560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "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"
   },
@@ -14518,8 +14570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14528,8 +14580,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14538,8 +14590,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14548,8 +14600,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-953",
-   "self_type" : "type-958",
+   "referenced_type" : "type-976",
+   "self_type" : "type-980",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14558,8 +14610,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-1072",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1097",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14568,8 +14620,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-1143",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1167",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14578,8 +14630,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-1212",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14588,8 +14640,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-1290",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14598,8 +14650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-541",
+   "referenced_type" : "type-151",
+   "self_type" : "type-552",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14608,8 +14660,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14619,7 +14671,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-93",
+   "self_type" : "type-90",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14628,8 +14680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14638,8 +14690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14648,8 +14700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14658,8 +14710,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-978",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1068",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14668,8 +14720,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-626",
-   "self_type" : "type-654",
+   "referenced_type" : "type-637",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14678,8 +14730,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-131",
-   "self_type" : "type-161",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14688,8 +14740,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14698,8 +14750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-332",
+   "referenced_type" : "type-20",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14708,8 +14760,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-981",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1383",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14718,8 +14770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-510",
+   "referenced_type" : "type-361",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14728,8 +14780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-298",
+   "referenced_type" : "type-273",
+   "self_type" : "type-303",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14738,8 +14790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-279",
+   "referenced_type" : "type-281",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14748,8 +14800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-274",
+   "referenced_type" : "type-141",
+   "self_type" : "type-279",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14758,8 +14810,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-977",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14768,8 +14820,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-636",
+   "self_type" : "type-642",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14778,8 +14830,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-130",
-   "self_type" : "type-991",
+   "referenced_type" : "type-136",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14788,8 +14840,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-632",
-   "self_type" : "type-637",
+   "referenced_type" : "type-644",
+   "self_type" : "type-648",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14798,8 +14850,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-550",
+   "referenced_type" : "type-127",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14808,8 +14860,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-292",
+   "referenced_type" : "type-295",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14818,8 +14870,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-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-420",
+   "self_type" : "type-424",
    "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"
   },
@@ -14828,8 +14880,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-141",
-   "self_type" : "type-308",
+   "referenced_type" : "type-147",
+   "self_type" : "type-313",
    "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"
   },
@@ -14838,8 +14890,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-24",
-   "self_type" : "type-378",
+   "referenced_type" : "type-31",
+   "self_type" : "type-383",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14848,8 +14900,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-377",
-   "self_type" : "type-392",
+   "referenced_type" : "type-382",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14858,8 +14910,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -14868,8 +14920,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-173",
-   "self_type" : "type-177",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -14878,8 +14930,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-23",
-   "self_type" : "type-574",
+   "referenced_type" : "type-30",
+   "self_type" : "type-585",
    "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"
   },
@@ -14888,8 +14940,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-134",
-   "self_type" : "type-990",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1010",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14898,8 +14950,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-573",
-   "self_type" : "type-578",
+   "referenced_type" : "type-584",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14908,8 +14960,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-96",
-   "self_type" : "type-576",
+   "referenced_type" : "type-102",
+   "self_type" : "type-587",
    "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"
   },
@@ -14918,8 +14970,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-63",
-   "self_type" : "type-568",
+   "referenced_type" : "type-70",
+   "self_type" : "type-580",
    "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"
   },
@@ -14928,8 +14980,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -14938,8 +14990,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-22",
-   "self_type" : "type-583",
+   "referenced_type" : "type-29",
+   "self_type" : "type-595",
    "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"
   },
@@ -14948,8 +15000,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-202",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -14958,8 +15010,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -14968,8 +15020,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-70",
-   "self_type" : "type-571",
+   "referenced_type" : "type-77",
+   "self_type" : "type-582",
    "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"
   },
@@ -14978,8 +15030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-586",
+   "referenced_type" : "type-51",
+   "self_type" : "type-597",
    "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"
   },
@@ -14988,8 +15040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-519",
+   "referenced_type" : "type-439",
+   "self_type" : "type-530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14998,8 +15050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15008,8 +15060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15018,8 +15070,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-609",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15028,8 +15080,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15038,8 +15090,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-916",
-   "self_type" : "type-915",
+   "referenced_type" : "type-936",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15048,8 +15100,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-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15058,8 +15110,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-85",
-   "self_type" : "type-483",
+   "referenced_type" : "type-94",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15068,8 +15120,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15078,26 +15130,6 @@
    "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-61",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 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-20",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 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-68",
    "self_type" : "type-67",
    "size" : 8,
@@ -15106,10 +15138,30 @@
   {
    "alignment" : 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-27",
+   "self_type" : "type-37",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-75",
+   "self_type" : "type-74",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15118,8 +15170,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-499",
+   "referenced_type" : "type-384",
+   "self_type" : "type-511",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15127,16 +15179,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "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-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -15144,8 +15196,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-354",
-   "self_type" : "type-490",
+   "referenced_type" : "type-359",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15154,8 +15206,8 @@
    "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-359",
-   "self_type" : "type-486",
+   "referenced_type" : "type-364",
+   "self_type" : "type-497",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15164,8 +15216,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-106",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15174,8 +15226,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15184,8 +15236,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15194,8 +15246,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-72",
-   "self_type" : "type-226",
+   "referenced_type" : "type-63",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15204,8 +15256,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-39",
-   "self_type" : "type-221",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15215,7 +15267,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-162",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15223,80 +15275,72 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1105",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "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-1177",
+   "self_type" : "type-1176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1375",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1548",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15311,80 +15355,88 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "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-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-813",
-   "self_type" : "type-812",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
+   "referenced_type" : "type-909",
+   "self_type" : "type-908",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-986",
+   "self_type" : "type-985",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15392,8 +15444,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-346",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15402,8 +15454,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15413,7 +15465,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-272",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15422,8 +15474,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-147",
-   "self_type" : "type-146",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15432,8 +15484,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15442,8 +15494,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-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15452,8 +15504,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1080",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15462,8 +15514,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15472,8 +15524,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-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1183",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15482,8 +15534,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-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1255",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15492,8 +15544,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-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15502,8 +15554,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-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15512,8 +15564,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-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15522,8 +15574,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-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15532,8 +15584,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-1474",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15542,8 +15594,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-1538",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15552,8 +15604,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-1562",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15572,8 +15624,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-237",
-   "self_type" : "type-236",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15582,8 +15634,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-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15592,8 +15644,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-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15602,8 +15654,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-642",
-   "self_type" : "type-641",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15612,8 +15664,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-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15622,8 +15674,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15632,8 +15684,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-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15642,8 +15694,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-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15652,8 +15704,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-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15662,8 +15714,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15672,8 +15724,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-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15682,8 +15734,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-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15692,8 +15744,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-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15702,8 +15754,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-1386",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15712,8 +15764,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-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15722,8 +15774,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-1570",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15732,8 +15784,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-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15742,8 +15794,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15752,8 +15804,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-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15762,8 +15814,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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15772,8 +15824,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-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15782,8 +15834,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-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15792,8 +15844,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-1040",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1058",
    "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"
   },
@@ -15802,8 +15854,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-1111",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "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"
   },
@@ -15812,8 +15864,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-1178",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "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"
   },
@@ -15822,8 +15874,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-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "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"
   },
@@ -15832,8 +15884,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-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "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"
   },
@@ -15842,8 +15894,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-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "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"
   },
@@ -15852,8 +15904,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-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "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"
   },
@@ -15862,8 +15914,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-1568",
-   "self_type" : "type-1567",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "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"
   },
@@ -15872,8 +15924,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-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "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"
   },
@@ -15882,8 +15934,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -15892,8 +15944,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-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "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"
   },
@@ -15902,8 +15954,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-694",
-   "self_type" : "type-693",
+   "referenced_type" : "type-716",
+   "self_type" : "type-715",
    "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"
   },
@@ -15912,8 +15964,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "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"
   },
@@ -15922,8 +15974,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-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-919",
+   "self_type" : "type-918",
    "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"
   },
@@ -15932,8 +15984,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-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15942,8 +15994,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-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15952,8 +16004,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-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1186",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15962,8 +16014,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-1236",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15972,8 +16024,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-1289",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15982,8 +16034,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15992,8 +16044,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-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
    "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"
   },
@@ -16002,438 +16054,278 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
-   "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-1545",
-   "self_type" : "type-1544",
-   "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-156",
-   "self_type" : "type-155",
-   "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-402",
-   "self_type" : "type-401",
-   "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-563",
-   "self_type" : "type-562",
-   "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-651",
-   "self_type" : "type-650",
-   "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-833",
-   "self_type" : "type-832",
-   "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-1541",
-   "self_type" : "type-1540",
-   "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-646",
-   "self_type" : "type-645",
-   "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-1282",
-   "self_type" : "type-1281",
-   "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-397",
-   "self_type" : "type-396",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "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-373",
-   "self_type" : "type-372",
-   "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-1093",
-   "self_type" : "type-1092",
-   "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-1161",
-   "self_type" : "type-1160",
-   "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-1230",
-   "self_type" : "type-1229",
-   "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-1307",
-   "self_type" : "type-1306",
-   "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-1359",
-   "self_type" : "type-1358",
-   "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-985",
-   "self_type" : "type-984",
-   "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-1091",
-   "self_type" : "type-1090",
-   "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-1159",
-   "self_type" : "type-1158",
-   "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-1228",
-   "self_type" : "type-1227",
-   "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-1305",
-   "self_type" : "type-1304",
-   "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-1357",
-   "self_type" : "type-1356",
-   "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-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::vector<int, std::allocator<int> >",
-   "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "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-821",
-   "self_type" : "type-820",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1055",
-   "self_type" : "type-1054",
-   "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-1123",
-   "self_type" : "type-1122",
-   "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-1188",
-   "self_type" : "type-1187",
-   "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-1241",
-   "self_type" : "type-1240",
-   "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-1264",
-   "self_type" : "type-1263",
-   "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-1336",
-   "self_type" : "type-1335",
-   "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-1390",
-   "self_type" : "type-1389",
-   "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-1409",
-   "self_type" : "type-1408",
-   "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-1499",
    "self_type" : "type-1498",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-1551",
-   "self_type" : "type-1550",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1566",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-1573",
-   "self_type" : "type-1572",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-1589",
-   "self_type" : "type-1588",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-214",
-   "self_type" : "type-213",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-258",
-   "self_type" : "type-257",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-386",
-   "self_type" : "type-385",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 16,
    "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-590",
-   "self_type" : "type-589",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1562",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 16,
    "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
    "referenced_type" : "type-658",
    "self_type" : "type-657",
+   "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-1292",
+   "self_type" : "type-1291",
+   "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-402",
+   "self_type" : "type-401",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
+   "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-378",
+   "self_type" : "type-377",
+   "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-1006",
+   "self_type" : "type-1005",
+   "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-1112",
+   "self_type" : "type-1111",
+   "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-1182",
+   "self_type" : "type-1181",
+   "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-1250",
+   "self_type" : "type-1249",
+   "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-1329",
+   "self_type" : "type-1328",
+   "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-1381",
+   "self_type" : "type-1380",
+   "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-1110",
+   "self_type" : "type-1109",
+   "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-1180",
+   "self_type" : "type-1179",
+   "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-1248",
+   "self_type" : "type-1247",
+   "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-1327",
+   "self_type" : "type-1326",
+   "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-1379",
+   "self_type" : "type-1378",
+   "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-996",
+   "self_type" : "type-995",
+   "size" : 16,
+   "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-134",
+   "self_type" : "type-133",
+   "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-843",
+   "self_type" : "type-842",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1073",
+   "self_type" : "type-1072",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16442,8 +16334,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-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16452,8 +16344,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16462,8 +16354,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1253",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16472,8 +16364,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-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "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-1358",
+   "self_type" : "type-1357",
+   "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-1412",
+   "self_type" : "type-1411",
+   "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-1431",
+   "self_type" : "type-1430",
+   "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-1521",
+   "self_type" : "type-1520",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-1601",
+   "self_type" : "type-1600",
+   "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-17",
+   "self_type" : "type-16",
+   "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-221",
+   "self_type" : "type-220",
+   "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-267",
+   "self_type" : "type-266",
+   "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-391",
+   "self_type" : "type-390",
+   "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-602",
+   "self_type" : "type-601",
+   "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-673",
+   "self_type" : "type-672",
+   "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-721",
+   "self_type" : "type-720",
+   "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-785",
+   "self_type" : "type-784",
+   "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-890",
+   "self_type" : "type-889",
+   "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-924",
+   "self_type" : "type-923",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16482,8 +16534,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16503,7 +16555,7 @@
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
    "referenced_type" : "type-12",
-   "self_type" : "type-215",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16512,8 +16564,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16521,8 +16573,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-296",
+   "referenced_type" : "type-22",
+   "self_type" : "type-301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16530,8 +16582,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-480",
+   "referenced_type" : "type-21",
+   "self_type" : "type-493",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -16545,14 +16597,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16564,17 +16616,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-431"
     }
    ],
    "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-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-320", "type-428" ],
+   "template_args" : [ "type-325", "type-439" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16584,17 +16636,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-308",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-302" ],
+   "template_args" : [ "type-307" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -16604,17 +16656,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-418" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16624,14 +16676,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16643,14 +16695,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-477"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16660,7 +16712,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-308"
     }
    ],
    "fields" :
@@ -16669,20 +16721,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16694,14 +16746,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16713,14 +16765,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16732,14 +16784,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16752,14 +16804,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -16799,8 +16851,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -16810,8 +16862,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16821,8 +16873,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16854,8 +16906,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16866,17 +16918,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-430"
     }
    ],
    "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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-432" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16923,14 +16975,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16988,14 +17040,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-326"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-325",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -17007,14 +17059,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -17025,7 +17077,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -17034,25 +17086,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-479"
     },
     {
      "access" : "private",
@@ -17064,19 +17116,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-544"
     },
     {
      "access" : "private",
@@ -17088,8 +17140,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -17179,17 +17231,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -17234,17 +17286,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-436",
+   "self_type" : "type-436",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-357" ],
+   "template_args" : [ "type-362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -17289,17 +17341,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-380" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -17344,17 +17396,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-423" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -17401,7 +17453,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
@@ -17419,14 +17471,14 @@
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -17478,14 +17530,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -17515,23 +17567,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-697"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-698"
     }
    ],
    "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-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-404" ],
+   "template_args" : [ "type-364", "type-419" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -17541,23 +17593,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-703"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-704"
     }
    ],
    "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-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-16" ],
+   "template_args" : [ "type-364", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -17567,23 +17619,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-380"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-381"
     }
    ],
    "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-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-377", "type-379" ],
+   "template_args" : [ "type-382", "type-384" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -17593,23 +17645,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -17619,23 +17671,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -17676,18 +17728,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-281"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -17769,14 +17821,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -17788,13 +17840,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -17811,11 +17863,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -17823,7 +17875,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17832,17 +17884,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -17850,7 +17902,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17859,17 +17911,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -17877,7 +17929,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17886,17 +17938,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -17904,63 +17956,9 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "field_offset" : 320,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "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-1072",
-   "self_type" : "type-1072",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "field_offset" : 320,
      "referenced_type" : "type-20"
     }
    ],
-   "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-1143",
-   "self_type" : "type-1143",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-15"
-    }
-   ],
    "fields" :
    [
     {
@@ -17970,22 +17968,22 @@
      "referenced_type" : "type-68"
     }
    ],
-   "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> >",
+   "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-1212",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1093",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17994,17 +17992,71 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-27"
+    }
+   ],
+   "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-1162",
+   "self_type" : "type-1162",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-27" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-20"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-75"
+    }
+   ],
+   "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-1232",
+   "self_type" : "type-1232",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-75" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-20"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-49"
     }
    ],
    "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-1290",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1312",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -18012,7 +18064,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -18021,17 +18073,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -18039,17 +18091,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -18088,34 +18140,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-707",
+   "self_type" : "type-707",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-696" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-710",
+   "self_type" : "type-710",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-702" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-409",
+   "self_type" : "type-409",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-379" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-664",
+   "self_type" : "type-664",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-413",
+   "self_type" : "type-413",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -18154,8 +18306,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -18167,14 +18319,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -18183,8 +18335,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -18193,8 +18345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -18203,8 +18355,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -18240,7 +18392,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -18251,8 +18403,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -18281,16 +18433,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-1000"
     }
    ],
    "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-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-981" ],
+   "template_args" : [ "type-1002" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -18299,16 +18451,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-638"
     }
    ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -18317,16 +18469,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -18335,16 +18487,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-995"
+     "referenced_type" : "type-1016"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1015",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -18354,7 +18506,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
@@ -18365,8 +18517,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -18377,16 +18529,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -18396,7 +18548,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -18407,8 +18559,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -18419,16 +18571,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -18438,7 +18590,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -18449,8 +18601,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -18462,7 +18614,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-1001"
     },
     {
      "field_name" : "_pad",
@@ -18473,8 +18625,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -18486,7 +18638,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-639"
     },
     {
      "field_name" : "_pad",
@@ -18497,8 +18649,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -18509,13 +18661,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -18528,7 +18680,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -18539,8 +18691,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -18551,13 +18703,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -18570,7 +18722,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -18581,8 +18733,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -18591,8 +18743,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -18610,14 +18762,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -18626,11 +18778,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-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1018",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLm32EJEEE"
   },
   {
@@ -18640,16 +18792,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-982"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLm32EJEEE"
   },
   {
@@ -18657,7 +18809,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-365"
     }
    ],
    "fields" :
@@ -18666,7 +18818,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -18678,13 +18830,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 256,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -18764,13 +18916,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -18852,19 +19004,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -18876,7 +19028,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -18888,13 +19040,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -18906,7 +19058,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -18918,13 +19070,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -18948,13 +19100,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -18967,7 +19119,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-999"
     },
     {
      "access" : "private",
@@ -18979,16 +19131,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-977",
-   "self_type" : "type-977",
+   "referenced_type" : "type-998",
+   "self_type" : "type-998",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-981" ],
+   "template_args" : [ "type-1002" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -18998,7 +19150,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-637"
     },
     {
      "access" : "private",
@@ -19010,16 +19162,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -19029,7 +19181,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -19041,16 +19193,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -19060,7 +19212,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-994"
+     "referenced_type" : "type-1015"
     },
     {
      "access" : "private",
@@ -19072,16 +19224,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -19089,7 +19241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-645"
     }
    ],
    "fields" :
@@ -19097,14 +19249,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-641"
     }
    ],
    "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-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -19116,7 +19268,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -19128,13 +19280,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -19147,19 +19299,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -19169,10 +19321,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19181,13 +19333,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -19309,10 +19461,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-423"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19321,19 +19473,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-422"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -19516,10 +19668,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19528,19 +19680,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "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",
@@ -19676,13 +19828,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "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"
@@ -19693,13 +19845,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "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",
@@ -19808,7 +19960,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19817,13 +19969,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -19945,7 +20097,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19954,13 +20106,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -20082,10 +20234,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20094,19 +20246,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -20313,10 +20465,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20325,19 +20477,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -20523,10 +20675,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20535,19 +20687,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-921",
-   "self_type" : "type-921",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "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",
@@ -20696,10 +20848,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20708,19 +20860,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "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",
@@ -20848,13 +21000,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -20996,12 +21148,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -21011,18 +21163,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -21032,13 +21184,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -21151,7 +21303,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21160,13 +21312,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -21288,10 +21440,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21300,19 +21452,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -21522,10 +21674,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21534,19 +21686,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "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",
@@ -21698,13 +21850,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -21849,7 +22001,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21858,13 +22010,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -21986,7 +22138,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21995,13 +22147,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -22123,10 +22275,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22135,19 +22287,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -22333,10 +22485,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22345,19 +22497,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -22582,10 +22734,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22594,19 +22746,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1219",
    "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",
@@ -22734,10 +22886,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22746,19 +22898,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1295",
    "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",
@@ -22925,13 +23077,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -23044,13 +23196,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -23217,17 +23369,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-545"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-534" ],
+   "template_args" : [ "type-546" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -23237,17 +23389,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-503" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -23257,17 +23409,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-950",
+   "self_type" : "type-950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-929" ],
+   "template_args" : [ "type-951" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -23277,17 +23429,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-440"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-431" ],
+   "template_args" : [ "type-442" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -23297,17 +23449,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-934",
-   "self_type" : "type-934",
+   "referenced_type" : "type-955",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-937" ],
+   "template_args" : [ "type-958" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -23317,17 +23469,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -23337,17 +23489,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -23357,17 +23509,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-617"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-610" ],
+   "template_args" : [ "type-622" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -23377,17 +23529,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -23397,17 +23549,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
    "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-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-936",
+   "self_type" : "type-936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-358" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -23417,17 +23569,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -23437,17 +23589,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
    "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-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -23457,17 +23609,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
    "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-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
+   "template_args" : [ "type-30" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -23477,57 +23629,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-69"
     }
    ],
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
+   "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-68",
    "self_type" : "type-68",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
+   "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-75",
+   "self_type" : "type-75",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -23537,69 +23689,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23609,52 +23761,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23664,19 +23816,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23686,74 +23838,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-550",
+   "self_type" : "type-550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23763,52 +23915,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23818,19 +23970,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23840,74 +23992,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23917,52 +24069,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23972,19 +24124,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-732",
+   "self_type" : "type-732",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23994,96 +24146,96 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-320" ],
+   "template_args" : [ "type-325" ],
    "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-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-317" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-562",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -24093,52 +24245,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -24148,19 +24300,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -24170,22 +24322,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -24195,23 +24347,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -24221,23 +24373,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-930"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-913" ],
+   "template_args" : [ "type-933" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -24247,23 +24399,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -24273,23 +24425,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -24298,18 +24450,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -24325,18 +24477,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-466"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -24347,7 +24499,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-462"
     },
     {
      "field_name" : "num_planes",
@@ -24357,13 +24509,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-453"
+     "referenced_type" : "type-464"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -24374,12 +24526,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-461"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bits_per_component",
@@ -24414,8 +24566,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -24426,38 +24578,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -24468,18 +24620,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -24490,17 +24642,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "ystride",
@@ -24520,13 +24672,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -24536,13 +24688,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -24553,35 +24705,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-350"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-345"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-344"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-342"
     }
    ],
    "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-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "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)"
@@ -24602,8 +24754,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -24614,12 +24766,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24644,13 +24796,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-342",
+   "self_type" : "type-342",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -24661,12 +24813,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24696,13 +24848,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -24713,12 +24865,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24748,13 +24900,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -24765,12 +24917,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24805,13 +24957,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -24855,8 +25007,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24864,8 +25016,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24873,8 +25025,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-953",
-   "self_type" : "type-956",
+   "referenced_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24882,8 +25034,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-1072",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24891,8 +25043,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-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1165",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24900,8 +25052,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-1212",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24909,8 +25061,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-1290",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24918,8 +25070,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-283",
+   "referenced_type" : "type-151",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24927,8 +25079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-394",
+   "referenced_type" : "type-19",
+   "self_type" : "type-399",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24937,7 +25089,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-706",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24945,8 +25097,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-686",
+   "referenced_type" : "type-419",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -24954,8 +25106,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-324",
+   "referenced_type" : "type-20",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24963,8 +25115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-268",
-   "self_type" : "type-278",
+   "referenced_type" : "type-273",
+   "self_type" : "type-283",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24972,8 +25124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-276",
-   "self_type" : "type-282",
+   "referenced_type" : "type-281",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24981,8 +25133,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24990,8 +25142,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-502",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24999,8 +25151,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-428",
-   "self_type" : "type-515",
+   "referenced_type" : "type-439",
+   "self_type" : "type-527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25008,8 +25160,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-916",
-   "self_type" : "type-948",
+   "referenced_type" : "type-936",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25017,8 +25169,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-507",
+   "referenced_type" : "type-505",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25026,8 +25178,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-85",
-   "self_type" : "type-592",
+   "referenced_type" : "type-94",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25035,8 +25187,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-181",
-   "self_type" : "type-941",
+   "referenced_type" : "type-188",
+   "self_type" : "type-962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25044,8 +25196,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-61",
-   "self_type" : "type-945",
+   "referenced_type" : "type-68",
+   "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25053,8 +25205,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25062,8 +25214,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-68",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25071,8 +25223,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25080,8 +25232,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-379",
-   "self_type" : "type-389",
+   "referenced_type" : "type-384",
+   "self_type" : "type-394",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25089,8 +25241,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-359",
-   "self_type" : "type-685",
+   "referenced_type" : "type-364",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25098,8 +25250,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-377",
-   "self_type" : "type-388",
+   "referenced_type" : "type-382",
+   "self_type" : "type-393",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25107,8 +25259,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-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25116,8 +25268,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-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25125,8 +25277,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-1171",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25134,8 +25286,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-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1262",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25143,8 +25295,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-1324",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25152,8 +25304,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-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25161,8 +25313,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25170,8 +25322,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25179,8 +25331,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25188,8 +25340,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25197,8 +25349,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25206,8 +25358,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25215,8 +25367,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25224,8 +25376,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25233,8 +25385,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25242,8 +25394,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25251,8 +25403,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25260,8 +25412,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
index 714c818..cba3630 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-549",
+   "referenced_type" : "type-146",
+   "self_type" : "type-546",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-714",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-841",
+   "referenced_type" : "type-25",
+   "self_type" : "type-850",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-364",
+   "referenced_type" : "type-103",
+   "self_type" : "type-371",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-562",
+   "referenced_type" : "type-103",
+   "self_type" : "type-559",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-814",
+   "self_type" : "type-826",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -70,8 +79,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -80,24 +89,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -114,16 +123,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -159,8 +168,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1797,10 +1806,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1809,10 +1814,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1849,10 +1850,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1865,14 +1862,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2717,8 +2706,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2735,8 +2724,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2753,8 +2742,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2779,8 +2768,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2809,8 +2798,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2831,8 +2820,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2885,8 +2874,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2939,8 +2928,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2965,8 +2954,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2983,8 +2972,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 4,
    "source_file" : "/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-2",
@@ -3009,11 +2998,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3059,8 +3048,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3113,8 +3102,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3139,8 +3128,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3181,8 +3170,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3423,8 +3412,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3453,8 +3442,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3483,8 +3472,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3525,8 +3514,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3563,8 +3552,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3589,8 +3578,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-797",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3607,8 +3596,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3637,8 +3626,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3731,8 +3720,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3773,8 +3762,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-798",
+   "self_type" : "type-798",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3791,8 +3780,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3821,8 +3810,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3855,8 +3844,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3909,8 +3898,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3926,12 +3915,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     }
    ],
-   "referenced_type" : "type-850",
+   "referenced_type" : "type-859",
    "return_type" : "type-2",
-   "self_type" : "type-850",
+   "self_type" : "type-859",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3944,10 +3933,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1012"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3957,10 +3946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3970,16 +3959,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3989,13 +3978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1139"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4005,13 +3994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1140"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4021,13 +4010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4037,13 +4026,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4053,13 +4042,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4069,10 +4058,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4082,10 +4071,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4095,10 +4084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4108,16 +4097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4126,14 +4115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4144,13 +4133,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-1132"
+     "referenced_type" : "type-1145"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4160,13 +4149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4176,13 +4165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4191,16 +4180,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1148"
     }
    ],
    "return_type" : "type-2",
@@ -4213,16 +4202,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
      "default_arg" : true,
@@ -4230,7 +4219,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1149"
     }
    ],
    "return_type" : "type-2",
@@ -4242,16 +4231,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1150"
     }
    ],
    "return_type" : "type-2",
@@ -4265,13 +4254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1151"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4280,16 +4269,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1152"
     }
    ],
    "return_type" : "type-2",
@@ -4301,16 +4290,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1140"
+     "referenced_type" : "type-1153"
     }
    ],
    "return_type" : "type-2",
@@ -4322,16 +4311,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1154"
     }
    ],
    "return_type" : "type-2",
@@ -4343,16 +4332,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1155"
     }
    ],
    "return_type" : "type-2",
@@ -4364,16 +4353,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1156"
     }
    ],
    "return_type" : "type-2",
@@ -4387,10 +4376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4400,13 +4389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4416,19 +4405,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4438,13 +4427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4454,19 +4443,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4476,10 +4465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4489,10 +4478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4502,10 +4491,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4514,13 +4503,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4529,19 +4518,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4551,16 +4540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4570,13 +4559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1157"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4586,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1158"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4602,13 +4591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4618,13 +4607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1159"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4633,16 +4622,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1147"
+     "referenced_type" : "type-1160"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,16 +4640,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1148"
+     "referenced_type" : "type-1161"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4670,13 +4659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1162"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4685,16 +4674,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1150"
+     "referenced_type" : "type-1163"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4704,10 +4693,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4717,10 +4706,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4729,16 +4718,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1151"
+     "referenced_type" : "type-1164"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4747,13 +4736,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4762,13 +4751,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4778,10 +4767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4791,16 +4780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4810,13 +4799,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4826,13 +4815,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4842,14 +4831,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4859,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4878,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1165"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4894,13 +4883,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1153"
+     "referenced_type" : "type-1166"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4910,14 +4899,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4927,13 +4916,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4943,13 +4932,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1167"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4959,11 +4948,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     }
    ],
    "return_type" : "type-2",
@@ -4976,13 +4965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1168"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4992,10 +4981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5005,10 +4994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5017,13 +5006,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5033,10 +5022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5046,16 +5035,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5064,14 +5053,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5080,14 +5069,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5098,13 +5087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5114,13 +5103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5130,13 +5119,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5145,16 +5134,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1177"
     }
    ],
    "return_type" : "type-2",
@@ -5167,16 +5156,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "default_arg" : true,
@@ -5184,7 +5173,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-1178"
     }
    ],
    "return_type" : "type-2",
@@ -5198,13 +5187,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5213,16 +5202,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1180"
     }
    ],
    "return_type" : "type-2",
@@ -5234,16 +5223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1181"
     }
    ],
    "return_type" : "type-2",
@@ -5255,16 +5244,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1182"
     }
    ],
    "return_type" : "type-2",
@@ -5276,16 +5265,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1183"
     }
    ],
    "return_type" : "type-2",
@@ -5297,16 +5286,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1171"
+     "referenced_type" : "type-1184"
     }
    ],
    "return_type" : "type-2",
@@ -5320,10 +5309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5332,16 +5321,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1172"
+     "referenced_type" : "type-1185"
     }
    ],
    "return_type" : "type-2",
@@ -5353,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1173"
+     "referenced_type" : "type-1186"
     }
    ],
    "return_type" : "type-2",
@@ -5375,13 +5364,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5391,13 +5380,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5407,10 +5396,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5420,10 +5409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5433,10 +5422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5445,16 +5434,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1187"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5464,16 +5453,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5483,13 +5472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1188"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,13 +5488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5515,16 +5504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5534,13 +5523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5550,13 +5539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1190"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5565,16 +5554,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1178"
+     "referenced_type" : "type-1191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5584,16 +5573,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1179"
+     "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5602,19 +5591,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5624,13 +5613,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5639,19 +5628,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-1194"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,10 +5650,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5674,10 +5663,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5687,19 +5676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5709,16 +5698,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5727,22 +5716,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5751,19 +5740,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5773,16 +5762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5792,16 +5781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5811,13 +5800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-1195"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5827,10 +5816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5840,16 +5829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5858,19 +5847,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5879,19 +5868,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5901,13 +5890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1196"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5917,13 +5906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5933,13 +5922,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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,14 +5938,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5966,16 +5955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5985,13 +5974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6001,13 +5990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6017,14 +6006,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -6034,13 +6023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6050,13 +6039,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6066,11 +6055,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     }
    ],
    "return_type" : "type-2",
@@ -6083,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1187"
+     "referenced_type" : "type-1200"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6099,10 +6088,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6112,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6124,13 +6113,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6140,10 +6129,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6153,16 +6142,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6171,14 +6160,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6187,14 +6176,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6205,13 +6194,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-1190"
+     "referenced_type" : "type-1203"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6221,13 +6210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6237,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6252,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "referenced_type" : "type-11"
@@ -6273,10 +6262,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
      "referenced_type" : "type-11"
@@ -6295,16 +6284,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
      "default_arg" : true,
@@ -6312,7 +6301,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1193"
+     "referenced_type" : "type-1206"
     }
    ],
    "return_type" : "type-2",
@@ -6326,13 +6315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6341,16 +6330,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1208"
     }
    ],
    "return_type" : "type-2",
@@ -6364,10 +6353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6377,13 +6366,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6393,13 +6382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6409,10 +6398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6422,10 +6411,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6435,10 +6424,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6448,16 +6437,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6467,13 +6456,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6483,13 +6472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6499,13 +6488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6515,13 +6504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6531,19 +6520,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,13 +6542,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6568,22 +6557,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-468"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6593,10 +6582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6606,10 +6595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6619,10 +6608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6632,16 +6621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6651,13 +6640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6667,13 +6656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6683,14 +6672,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6700,16 +6689,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6719,13 +6708,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6735,13 +6724,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6751,14 +6740,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6768,13 +6757,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6784,13 +6773,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6800,11 +6789,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-2",
@@ -6817,13 +6806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6833,10 +6822,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6846,10 +6835,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6858,13 +6847,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6874,10 +6863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6887,16 +6876,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,14 +6894,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6921,14 +6910,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6937,14 +6926,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6955,13 +6944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1206"
+     "referenced_type" : "type-1219"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6971,13 +6960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6987,13 +6976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7003,16 +6992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
      "default_arg" : true,
@@ -7020,7 +7009,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1212"
+     "referenced_type" : "type-1225"
     }
    ],
    "return_type" : "type-2",
@@ -7034,13 +7023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1213"
+     "referenced_type" : "type-1226"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7049,16 +7038,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
-     "referenced_type" : "type-1214"
+     "referenced_type" : "type-1227"
     }
    ],
    "return_type" : "type-2",
@@ -7072,10 +7061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7085,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7101,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7117,10 +7106,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7130,10 +7119,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7143,10 +7132,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7156,16 +7145,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7175,13 +7164,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1215"
+     "referenced_type" : "type-1228"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7191,13 +7180,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1216"
+     "referenced_type" : "type-1229"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7207,16 +7196,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7226,13 +7215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7242,13 +7231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1217"
+     "referenced_type" : "type-1230"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7258,16 +7247,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-1231"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7277,13 +7266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1232"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7293,10 +7282,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7306,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7319,19 +7308,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7341,16 +7330,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7360,19 +7349,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7381,22 +7370,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-549"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7406,16 +7395,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7425,16 +7414,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7444,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1233"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7460,10 +7449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7473,16 +7462,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7492,13 +7481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1234"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7508,13 +7497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7524,13 +7513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7540,14 +7529,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7557,16 +7546,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7576,13 +7565,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1235"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7592,13 +7581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1236"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7608,14 +7597,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7625,13 +7614,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7641,13 +7630,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1237"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7657,11 +7646,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     }
    ],
    "return_type" : "type-2",
@@ -7674,13 +7663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1238"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7690,10 +7679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7703,10 +7692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7715,13 +7704,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7731,10 +7720,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7744,16 +7733,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7762,14 +7751,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7778,14 +7767,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7795,14 +7784,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7812,16 +7801,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7831,13 +7820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1226"
+     "referenced_type" : "type-1239"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7847,13 +7836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1240"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7863,14 +7852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7880,13 +7869,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7896,13 +7885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1241"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7912,11 +7901,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     }
    ],
    "return_type" : "type-2",
@@ -7929,13 +7918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1229"
+     "referenced_type" : "type-1242"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7945,10 +7934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7958,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7970,13 +7959,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7986,10 +7975,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7999,16 +7988,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8017,14 +8006,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8033,14 +8022,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8049,14 +8038,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8065,14 +8054,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8083,13 +8072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-1245"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8099,13 +8088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8115,13 +8104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8132,13 +8121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8148,13 +8137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8164,13 +8153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8180,16 +8169,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
      "default_arg" : true,
@@ -8197,7 +8186,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-1257"
     }
    ],
    "return_type" : "type-2",
@@ -8211,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8226,16 +8215,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-1259"
     }
    ],
    "return_type" : "type-2",
@@ -8249,10 +8238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8262,13 +8251,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8278,13 +8267,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8294,10 +8283,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8307,10 +8296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8320,10 +8309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8333,16 +8322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
      "default_arg" : true,
@@ -8350,7 +8339,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1260"
     }
    ],
    "return_type" : "type-2",
@@ -8364,13 +8353,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1261"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8379,16 +8368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1262"
     }
    ],
    "return_type" : "type-2",
@@ -8400,16 +8389,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1263"
     }
    ],
    "return_type" : "type-2",
@@ -8421,16 +8410,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1251"
+     "referenced_type" : "type-1264"
     }
    ],
    "return_type" : "type-2",
@@ -8442,16 +8431,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1265"
     }
    ],
    "return_type" : "type-2",
@@ -8463,16 +8452,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1253"
+     "referenced_type" : "type-1266"
     }
    ],
    "return_type" : "type-2",
@@ -8486,10 +8475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8499,13 +8488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8515,13 +8504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8531,10 +8520,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8544,10 +8533,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8557,10 +8546,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8570,16 +8559,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8589,13 +8578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1254"
+     "referenced_type" : "type-1267"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8605,13 +8594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1268"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8621,13 +8610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8637,13 +8626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1269"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8652,19 +8641,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8674,13 +8663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1270"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8690,10 +8679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8703,10 +8692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8716,10 +8705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8729,16 +8718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8748,16 +8737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8767,13 +8756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8783,13 +8772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8799,16 +8788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8818,19 +8807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8840,13 +8829,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1271"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8856,13 +8845,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1272"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8872,16 +8861,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8891,19 +8880,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8913,13 +8902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8929,13 +8918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1273"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8945,16 +8934,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1261"
+     "referenced_type" : "type-1274"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8963,22 +8952,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8987,22 +8976,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9012,13 +9001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1275"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9028,10 +9017,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9041,10 +9030,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9054,22 +9043,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9079,16 +9068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9098,19 +9087,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9120,16 +9109,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9139,16 +9128,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9158,19 +9147,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9179,25 +9168,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9206,19 +9195,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1277"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9227,19 +9216,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9249,16 +9238,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9268,16 +9257,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9287,13 +9276,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1265"
+     "referenced_type" : "type-1278"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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,10 +9292,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9316,16 +9305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9335,13 +9324,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1279"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9351,13 +9340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9367,13 +9356,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9382,12 +9371,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-299", "type-153" ]
+   "template_args" : [ "type-31", "type-306", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9395,12 +9384,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9408,12 +9397,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9421,12 +9410,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9434,10 +9423,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-396"
     },
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-615"
     }
    ],
    "return_type" : "type-2",
@@ -9449,10 +9438,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-953"
+     "referenced_type" : "type-961"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     }
    ],
    "return_type" : "type-2",
@@ -9464,10 +9453,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
    "return_type" : "type-2",
@@ -9479,10 +9468,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
-   "return_type" : "type-385",
+   "return_type" : "type-378",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9491,13 +9480,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9512,19 +9501,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9533,10 +9522,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9564,14 +9553,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-976"
     }
    ],
    "return_type" : "type-2",
@@ -9584,10 +9573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9597,16 +9586,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9615,7 +9604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "referenced_type" : "type-2"
@@ -9624,7 +9613,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9639,10 +9628,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9660,10 +9649,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9681,10 +9670,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9705,10 +9694,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9717,10 +9706,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9738,10 +9727,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9759,10 +9748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9780,28 +9769,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-768",
+   "return_type" : "type-777",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9811,13 +9800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
      "referenced_type" : "type-604"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9827,10 +9816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     }
    ],
-   "return_type" : "type-279",
+   "return_type" : "type-289",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9840,19 +9829,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9862,19 +9851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9886,22 +9875,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9910,18 +9899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9929,18 +9918,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9948,18 +9937,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9967,18 +9956,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9986,18 +9975,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10005,18 +9994,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10024,18 +10013,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10043,18 +10032,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -10062,10 +10051,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-1281",
+   "return_type" : "type-1294",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10074,12 +10063,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10087,12 +10076,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10100,12 +10089,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10113,17 +10102,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10138,13 +10127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10153,18 +10142,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10172,18 +10161,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10191,18 +10180,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10210,18 +10199,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10229,29 +10218,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10260,19 +10249,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10281,10 +10270,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10293,10 +10282,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10305,10 +10294,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10320,79 +10309,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1297",
+   "referenced_type" : "type-1310",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1298",
+   "referenced_type" : "type-1311",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-633",
+   "referenced_type" : "type-713",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10402,8 +10391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-865",
+   "referenced_type" : "type-865",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10411,8 +10400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-880",
+   "referenced_type" : "type-885",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10420,8 +10409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-493",
-   "self_type" : "type-517",
+   "referenced_type" : "type-489",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10429,17 +10418,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-469",
+   "referenced_type" : "type-472",
    "self_type" : "type-483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-415",
+   "self_type" : "type-1098",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-420",
+   "self_type" : "type-1101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10447,8 +10454,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10456,8 +10463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10465,8 +10472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10474,8 +10481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-616",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10483,8 +10490,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10492,8 +10499,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10501,8 +10508,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-329",
-   "self_type" : "type-333",
+   "referenced_type" : "type-337",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10510,8 +10517,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-470",
-   "self_type" : "type-473",
+   "referenced_type" : "type-476",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10519,8 +10526,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-552",
-   "self_type" : "type-555",
+   "referenced_type" : "type-560",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10528,8 +10535,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-639",
+   "self_type" : "type-642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10537,8 +10544,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-709",
-   "self_type" : "type-713",
+   "referenced_type" : "type-717",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10546,8 +10553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-405",
+   "referenced_type" : "type-151",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10555,8 +10562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-706",
+   "referenced_type" : "type-19",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10573,8 +10580,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-360",
-   "self_type" : "type-445",
+   "referenced_type" : "type-367",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10582,8 +10589,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-353",
-   "self_type" : "type-437",
+   "referenced_type" : "type-359",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10591,8 +10598,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10600,8 +10607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10609,8 +10616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-363",
-   "self_type" : "type-448",
+   "referenced_type" : "type-370",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10618,8 +10625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-318",
-   "self_type" : "type-338",
+   "referenced_type" : "type-310",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10627,8 +10634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-442",
+   "referenced_type" : "type-141",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10636,8 +10643,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-359",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10645,8 +10652,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-352",
-   "self_type" : "type-358",
+   "referenced_type" : "type-358",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10654,8 +10661,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-1029",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10663,8 +10670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10672,8 +10679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10681,8 +10688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-921",
+   "referenced_type" : "type-777",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10690,8 +10697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10699,8 +10706,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-276",
-   "self_type" : "type-325",
+   "referenced_type" : "type-286",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10708,8 +10715,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-85",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10717,8 +10724,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-181",
-   "self_type" : "type-317",
+   "referenced_type" : "type-188",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10726,8 +10733,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-61",
-   "self_type" : "type-320",
+   "referenced_type" : "type-68",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10735,8 +10742,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10744,8 +10751,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-70",
-   "self_type" : "type-624",
+   "referenced_type" : "type-75",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10753,8 +10760,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10762,8 +10769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-638",
-   "self_type" : "type-904",
+   "referenced_type" : "type-633",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10771,8 +10778,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-282",
-   "self_type" : "type-888",
+   "referenced_type" : "type-292",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10780,8 +10787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
+   "referenced_type" : "type-504",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10789,8 +10796,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-479",
+   "referenced_type" : "type-474",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10798,8 +10805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10807,8 +10814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10816,8 +10823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10825,8 +10832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "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"
   },
@@ -10834,8 +10841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1925",
    "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"
   },
@@ -10843,8 +10850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1977",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1999",
    "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"
   },
@@ -10852,8 +10859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2059",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10861,8 +10868,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "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"
   },
@@ -10870,8 +10877,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-389",
-   "self_type" : "type-391",
+   "referenced_type" : "type-397",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10879,8 +10886,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-520",
+   "referenced_type" : "type-523",
+   "self_type" : "type-525",
    "size" : 4,
    "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"
   },
@@ -10888,8 +10895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-596",
+   "referenced_type" : "type-599",
+   "self_type" : "type-601",
    "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"
   },
@@ -10897,8 +10904,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-612",
+   "referenced_type" : "type-608",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10906,8 +10913,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-674",
-   "self_type" : "type-676",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "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"
   },
@@ -10915,8 +10922,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-738",
+   "referenced_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10924,8 +10931,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-820",
+   "referenced_type" : "type-827",
+   "self_type" : "type-829",
    "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"
   },
@@ -10933,8 +10940,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10942,8 +10949,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10951,8 +10958,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-953",
+   "referenced_type" : "type-90",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10960,8 +10967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-403",
-   "self_type" : "type-402",
+   "referenced_type" : "type-412",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10969,8 +10976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10978,8 +10985,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
+   "referenced_type" : "type-424",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10988,7 +10995,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
    "referenced_type" : "type-328",
-   "self_type" : "type-330",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10996,8 +11003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-313",
+   "referenced_type" : "type-298",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11005,8 +11012,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-806",
-   "self_type" : "type-823",
+   "referenced_type" : "type-814",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11014,8 +11021,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-395",
-   "self_type" : "type-394",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11023,8 +11030,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-373",
-   "self_type" : "type-396",
+   "referenced_type" : "type-381",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11032,8 +11039,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-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11041,8 +11048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-952",
-   "self_type" : "type-956",
+   "referenced_type" : "type-963",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11050,8 +11057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-406",
+   "referenced_type" : "type-389",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11059,8 +11066,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-684",
-   "self_type" : "type-687",
+   "referenced_type" : "type-675",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11068,8 +11075,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-372",
-   "self_type" : "type-443",
+   "referenced_type" : "type-380",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11077,8 +11084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11086,8 +11093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11095,8 +11102,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-275",
-   "self_type" : "type-289",
+   "referenced_type" : "type-285",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11104,8 +11111,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-895",
-   "self_type" : "type-898",
+   "referenced_type" : "type-905",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11113,8 +11120,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-775",
-   "self_type" : "type-887",
+   "referenced_type" : "type-784",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11122,8 +11129,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11131,8 +11138,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11140,8 +11147,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11149,8 +11156,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11158,8 +11165,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11167,8 +11174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-902",
-   "self_type" : "type-903",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11176,8 +11183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11185,8 +11192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11194,7 +11201,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-602",
+   "referenced_type" : "type-597",
    "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
@@ -11203,8 +11210,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-893",
-   "self_type" : "type-894",
+   "referenced_type" : "type-903",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11212,8 +11219,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-889",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-898",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11221,8 +11228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11230,8 +11237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11239,8 +11246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11248,254 +11255,254 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1023",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1035",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1443",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1490",
+   "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-1505",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1528",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1557",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1587",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1639",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1678",
    "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-1749",
+   "self_type" : "type-1751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "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-1879",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1899",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2047",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2149",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2210",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-368",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-348",
-   "self_type" : "type-350",
+   "self_type" : "type-353",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-487",
+   "referenced_type" : "type-354",
+   "self_type" : "type-356",
    "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",
+   "referenced_type" : "type-493",
+   "self_type" : "type-495",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-647",
+   "referenced_type" : "type-574",
+   "self_type" : "type-576",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-798",
+   "referenced_type" : "type-732",
+   "self_type" : "type-734",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-860",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-949",
-   "self_type" : "type-951",
+   "referenced_type" : "type-867",
+   "self_type" : "type-869",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-958",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11503,7 +11510,7 @@
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
    "referenced_type" : "type-566",
-   "self_type" : "type-576",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11511,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11520,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11529,8 +11536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11538,8 +11545,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-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11547,8 +11554,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11556,8 +11563,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-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11565,8 +11572,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-1513",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11574,8 +11581,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-1547",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11583,8 +11590,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-155",
-   "self_type" : "type-157",
+   "referenced_type" : "type-162",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11592,8 +11599,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-1627",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11602,7 +11609,7 @@
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-1747",
-   "self_type" : "type-1751",
+   "self_type" : "type-1761",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11610,8 +11617,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-1760",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11619,8 +11626,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-1828",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11628,8 +11635,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-1889",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11637,8 +11644,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-1960",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11646,8 +11653,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-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11655,8 +11662,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-2084",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2106",
    "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"
   },
@@ -11664,8 +11671,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-2138",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11673,8 +11680,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-2206",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11682,8 +11689,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-399",
-   "self_type" : "type-401",
+   "referenced_type" : "type-407",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11691,8 +11698,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-499",
-   "self_type" : "type-501",
+   "referenced_type" : "type-505",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11700,8 +11707,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-580",
-   "self_type" : "type-582",
+   "referenced_type" : "type-584",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11709,8 +11716,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-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-662",
+   "self_type" : "type-664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11718,8 +11725,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-707",
-   "self_type" : "type-710",
+   "referenced_type" : "type-710",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11727,8 +11734,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-741",
-   "self_type" : "type-744",
+   "referenced_type" : "type-750",
+   "self_type" : "type-752",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11736,8 +11743,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-815",
-   "self_type" : "type-817",
+   "referenced_type" : "type-822",
+   "self_type" : "type-824",
    "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"
   },
@@ -11745,8 +11752,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-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-973",
+   "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11754,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11763,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11772,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11781,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11790,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11799,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11808,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11817,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11826,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11835,8 +11842,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-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11844,8 +11851,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-1090",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11853,8 +11860,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-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11862,8 +11869,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-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11871,8 +11878,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-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11880,8 +11887,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-1472",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11889,8 +11896,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-1522",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11898,8 +11905,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-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11907,8 +11914,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-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11916,8 +11923,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-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11925,8 +11932,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-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11934,8 +11941,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-1668",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11943,8 +11950,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-1678",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11952,8 +11959,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-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1688",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11961,8 +11968,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-1847",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11970,8 +11977,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-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11979,8 +11986,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-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11988,8 +11995,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-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11997,8 +12004,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-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12006,8 +12013,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-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12015,8 +12022,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12024,8 +12031,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-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12033,8 +12040,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "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-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12051,8 +12067,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-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12060,8 +12076,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12069,8 +12085,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12078,8 +12094,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-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12087,8 +12103,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-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12096,8 +12112,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12105,8 +12121,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-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12114,8 +12130,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-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12123,8 +12139,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-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12132,17 +12148,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-870",
-   "self_type" : "type-869",
-   "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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12150,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12159,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12168,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12177,8 +12184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12187,7 +12194,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-466",
+   "self_type" : "type-461",
    "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"
   },
@@ -12195,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-979",
+   "referenced_type" : "type-103",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -12207,8 +12214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-875",
+   "referenced_type" : "type-876",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -12216,8 +12223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-861",
+   "referenced_type" : "type-865",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12225,8 +12232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-864",
-   "self_type" : "type-866",
+   "referenced_type" : "type-873",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12234,8 +12241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-878",
+   "referenced_type" : "type-885",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12243,8 +12250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-879",
-   "self_type" : "type-881",
+   "referenced_type" : "type-888",
+   "self_type" : "type-890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12252,8 +12259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-883",
+   "referenced_type" : "type-893",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12261,8 +12268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12270,8 +12277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12279,8 +12286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12288,8 +12295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12297,8 +12304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12306,8 +12313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12315,8 +12322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12324,339 +12331,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2021",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/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-946",
-   "self_type" : "type-945",
-   "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-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ScopedTrace *",
-   "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Trace.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-897",
-   "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-1315",
-   "self_type" : "type-1314",
-   "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-1440",
    "self_type" : "type-1439",
    "size" : 4,
@@ -12664,35 +12338,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "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-1600",
-   "self_type" : "type-1599",
-   "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-1671",
-   "self_type" : "type-1670",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1673",
    "self_type" : "type-1672",
    "size" : 4,
@@ -12700,100 +12401,262 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1742",
    "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-1800",
-   "self_type" : "type-1799",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
    "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-1855",
-   "self_type" : "type-1854",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "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-1916",
-   "self_type" : "type-1915",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "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-1995",
-   "self_type" : "type-1994",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "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",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "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-260",
-   "self_type" : "type-259",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
    "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-291",
-   "self_type" : "type-290",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "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-455",
-   "self_type" : "type-454",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "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-534",
-   "self_type" : "type-533",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-487",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/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-646",
+   "self_type" : "type-645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-730",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "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-282",
+   "self_type" : "type-281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-472",
+   "self_type" : "type-484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-728",
+   "self_type" : "type-900",
+   "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-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12801,8 +12664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12810,8 +12673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12819,8 +12682,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "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-1682",
+   "self_type" : "type-1681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12828,8 +12700,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
+   "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-1707",
+   "self_type" : "type-1706",
+   "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-1821",
+   "self_type" : "type-1820",
+   "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-1875",
+   "self_type" : "type-1874",
+   "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-1937",
+   "self_type" : "type-1936",
+   "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-2015",
+   "self_type" : "type-2014",
+   "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-2081",
+   "self_type" : "type-2080",
+   "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-269",
+   "self_type" : "type-268",
+   "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-297",
+   "self_type" : "type-296",
+   "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-460",
+   "self_type" : "type-459",
+   "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-540",
+   "self_type" : "type-539",
+   "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-614",
+   "self_type" : "type-613",
+   "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-635",
+   "self_type" : "type-634",
+   "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-65",
+   "self_type" : "type-64",
+   "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-698",
+   "self_type" : "type-697",
+   "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,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12837,8 +12844,8 @@
    "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-408",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-415",
+   "self_type" : "type-1092",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12846,8 +12853,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-413",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-420",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12855,8 +12862,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-633",
-   "self_type" : "type-667",
+   "referenced_type" : "type-628",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12864,8 +12871,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-245",
-   "self_type" : "type-423",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12873,8 +12880,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-239",
-   "self_type" : "type-417",
+   "referenced_type" : "type-246",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12891,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12900,8 +12907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12909,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12918,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12927,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12936,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12945,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12963,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12972,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12981,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12990,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12999,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13008,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13017,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13026,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13035,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13044,8 +13051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13053,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13062,17 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
-   "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-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13089,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13098,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13107,8 +13105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13116,8 +13114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13125,8 +13123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13134,8 +13132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13143,8 +13141,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
+   "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-704",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13161,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13170,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-996",
-   "self_type" : "type-995",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13179,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13188,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13197,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13206,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13215,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13224,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13233,8 +13240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13242,8 +13249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13251,8 +13258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13260,8 +13267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13269,8 +13276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13278,8 +13285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13287,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13296,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13305,8 +13312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13314,8 +13321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13323,8 +13330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13332,8 +13339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13341,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13350,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13359,8 +13366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13368,8 +13375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13377,8 +13384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-700",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13386,8 +13393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13395,8 +13402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-963",
+   "referenced_type" : "type-970",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13404,8 +13411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13413,8 +13420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13422,8 +13429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1779",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13431,8 +13438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "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"
   },
@@ -13440,8 +13447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "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"
   },
@@ -13449,8 +13456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "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"
   },
@@ -13458,8 +13465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13467,8 +13474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "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"
   },
@@ -13476,8 +13483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13485,8 +13492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "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"
   },
@@ -13494,8 +13501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-603",
+   "self_type" : "type-602",
    "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"
   },
@@ -13503,8 +13510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-612",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13512,8 +13519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "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"
   },
@@ -13521,8 +13528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-739",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13530,8 +13537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
+   "referenced_type" : "type-831",
+   "self_type" : "type-830",
    "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"
   },
@@ -13539,8 +13546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13548,8 +13555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13557,8 +13564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13566,8 +13573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13575,8 +13582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13584,8 +13591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13593,8 +13600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13602,8 +13609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13611,8 +13618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13620,8 +13627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13629,8 +13636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13638,8 +13645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13647,8 +13654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13656,8 +13663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13665,8 +13672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +13681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13683,8 +13690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13692,8 +13699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-627",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13701,8 +13708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13710,8 +13717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13719,8 +13726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13728,8 +13735,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13737,8 +13744,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13746,8 +13753,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-329",
-   "self_type" : "type-331",
+   "referenced_type" : "type-337",
+   "self_type" : "type-338",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13755,8 +13762,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-470",
-   "self_type" : "type-471",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13764,8 +13771,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-552",
-   "self_type" : "type-553",
+   "referenced_type" : "type-560",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13773,8 +13780,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-625",
-   "self_type" : "type-628",
+   "referenced_type" : "type-639",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13782,8 +13789,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-709",
-   "self_type" : "type-711",
+   "referenced_type" : "type-717",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13791,8 +13798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-297",
+   "referenced_type" : "type-151",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13800,8 +13807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-657",
+   "referenced_type" : "type-19",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13810,7 +13817,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-940",
+   "self_type" : "type-950",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +13825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13827,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13836,16 +13843,61 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-1097",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1100",
+   "self_type" : "type-1102",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-713",
+   "self_type" : "type-715",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1060",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-721",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
+   "referenced_type" : "type-56",
    "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -13854,8 +13906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13863,8 +13915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13872,8 +13924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-72",
+   "self_type" : "type-71",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13881,8 +13933,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-360",
-   "self_type" : "type-444",
+   "referenced_type" : "type-367",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13890,8 +13942,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-353",
-   "self_type" : "type-436",
+   "referenced_type" : "type-359",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13899,8 +13951,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-131",
-   "self_type" : "type-159",
+   "referenced_type" : "type-137",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +13960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13917,7 +13969,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
+   "referenced_type" : "type-20",
    "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -13926,8 +13978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-370",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13935,8 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13944,8 +13996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13953,8 +14005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-322",
+   "referenced_type" : "type-310",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13962,8 +14014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-355",
+   "referenced_type" : "type-141",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13971,8 +14023,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-359",
-   "self_type" : "type-365",
+   "referenced_type" : "type-366",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13980,8 +14032,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-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-358",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13989,8 +14041,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-130",
-   "self_type" : "type-142",
+   "referenced_type" : "type-136",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13998,8 +14050,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-1029",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14007,8 +14059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14016,8 +14068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14025,8 +14077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-536",
+   "referenced_type" : "type-160",
+   "self_type" : "type-534",
    "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"
   },
@@ -14034,8 +14086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14043,8 +14095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14052,8 +14104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14061,8 +14113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
    "size" : 4,
    "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"
   },
@@ -14070,8 +14122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "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"
   },
@@ -14079,8 +14131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-296",
+   "referenced_type" : "type-192",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14088,8 +14140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-319",
+   "referenced_type" : "type-181",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14097,8 +14149,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-299",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14106,8 +14158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-458",
+   "referenced_type" : "type-464",
+   "self_type" : "type-465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14115,8 +14167,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14124,8 +14176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14133,8 +14185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14142,8 +14194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "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"
   },
@@ -14151,8 +14203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-538",
+   "referenced_type" : "type-200",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14160,8 +14212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-537",
+   "referenced_type" : "type-542",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14169,8 +14221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14178,8 +14230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
    "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"
   },
@@ -14187,8 +14239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
    "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"
   },
@@ -14196,8 +14248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-611",
+   "referenced_type" : "type-209",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14205,8 +14257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14214,8 +14266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-610",
+   "referenced_type" : "type-617",
+   "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14223,8 +14275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14232,8 +14284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14241,8 +14293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14250,8 +14302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-905",
-   "self_type" : "type-938",
+   "referenced_type" : "type-915",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14259,8 +14311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-305",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14268,8 +14320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-917",
+   "referenced_type" : "type-777",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14277,8 +14329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14286,8 +14338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-932",
+   "referenced_type" : "type-937",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14295,8 +14347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14304,357 +14356,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-276",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-638",
-   "self_type" : "type-901",
-   "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-268",
-   "self_type" : "type-274",
-   "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-279",
-   "self_type" : "type-892",
-   "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-282",
-   "self_type" : "type-886",
-   "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-831",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "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-477",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-407",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-412",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1044",
-   "self_type" : "type-1046",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-704",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1493",
-   "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-2011",
-   "self_type" : "type-2015",
-   "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-924",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-334",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-556",
-   "self_type" : "type-557",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-631",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1325",
-   "self_type" : "type-1327",
-   "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-1607",
-   "self_type" : "type-1609",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -14662,10 +14363,361 @@
   },
   {
    "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-286",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-1007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-1014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-1010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-1016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-1012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-910",
+   "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-278",
+   "self_type" : "type-284",
+   "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-289",
+   "self_type" : "type-902",
+   "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-292",
+   "self_type" : "type-892",
+   "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-840",
+   "self_type" : "type-846",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-504",
+   "self_type" : "type-508",
+   "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-474",
+   "self_type" : "type-475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-414",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-419",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-673",
+   "self_type" : "type-674",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1054",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-701",
+   "self_type" : "type-702",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1512",
+   "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-2031",
+   "self_type" : "type-2033",
+   "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-934",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-341",
+   "self_type" : "type-342",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-480",
+   "self_type" : "type-481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-564",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-643",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-722",
+   "self_type" : "type-723",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-344",
+   "self_type" : "type-953",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1345",
+   "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-1628",
+   "self_type" : "type-1630",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-446",
-   "self_type" : "type-447",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14673,8 +14725,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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14682,8 +14734,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14691,8 +14743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-969",
+   "referenced_type" : "type-132",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14700,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-558",
+   "referenced_type" : "type-531",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14709,8 +14761,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-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14718,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-914",
+   "referenced_type" : "type-923",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14728,7 +14780,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
    "referenced_type" : "type-328",
-   "self_type" : "type-341",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14736,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14745,8 +14797,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-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-814",
+   "self_type" : "type-815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14754,8 +14806,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-395",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-403",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14763,8 +14815,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-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14772,8 +14824,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-1034",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14781,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-955",
+   "referenced_type" : "type-963",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,7 +14842,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-389",
    "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -14799,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-727",
-   "self_type" : "type-731",
+   "referenced_type" : "type-739",
+   "self_type" : "type-742",
    "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"
   },
@@ -14808,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-632",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14817,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -14826,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -14835,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-977",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14844,8 +14896,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-372",
-   "self_type" : "type-371",
+   "referenced_type" : "type-380",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14853,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-970",
-   "self_type" : "type-972",
+   "referenced_type" : "type-980",
+   "self_type" : "type-981",
    "size" : 4,
    "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"
   },
@@ -14862,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -14871,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
+   "referenced_type" : "type-995",
+   "self_type" : "type-996",
    "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"
   },
@@ -14880,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -14889,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -14898,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "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"
   },
@@ -14907,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-988",
-   "self_type" : "type-989",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "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"
   },
@@ -14916,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
+   "referenced_type" : "type-931",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14925,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-934",
+   "referenced_type" : "type-942",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14934,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14943,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14952,8 +15004,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-275",
-   "self_type" : "type-326",
+   "referenced_type" : "type-285",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14961,8 +15013,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-895",
-   "self_type" : "type-912",
+   "referenced_type" : "type-905",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,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-775",
-   "self_type" : "type-916",
+   "referenced_type" : "type-784",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14979,8 +15031,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-223",
-   "self_type" : "type-999",
+   "referenced_type" : "type-230",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14988,8 +15040,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-60",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14997,8 +15049,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-30",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-37",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15006,8 +15058,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-69",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-74",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15015,8 +15067,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-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-48",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15024,8 +15076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-902",
-   "self_type" : "type-907",
+   "referenced_type" : "type-912",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15033,8 +15085,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-893",
-   "self_type" : "type-899",
+   "referenced_type" : "type-903",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15042,8 +15094,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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-898",
+   "self_type" : "type-899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15051,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15060,8 +15112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-491",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15069,8 +15121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-370",
+   "referenced_type" : "type-158",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15079,7 +15131,7 @@
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
    "referenced_type" : "type-566",
-   "self_type" : "type-575",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15087,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15096,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-381",
+   "referenced_type" : "type-122",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15105,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-426",
+   "referenced_type" : "type-399",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15114,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-850",
-   "self_type" : "type-851",
+   "referenced_type" : "type-859",
+   "self_type" : "type-860",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -15124,7 +15176,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15132,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-560",
-   "self_type" : "type-579",
+   "referenced_type" : "type-557",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15142,7 +15194,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15150,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-832",
+   "referenced_type" : "type-103",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -15160,7 +15212,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-393",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15168,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-735",
+   "referenced_type" : "type-22",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15177,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-735",
-   "self_type" : "type-852",
+   "referenced_type" : "type-746",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -15190,8 +15242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15200,8 +15252,8 @@
    "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",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15210,8 +15262,8 @@
    "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",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15220,8 +15272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15230,8 +15282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15240,8 +15292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15250,8 +15302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15260,8 +15312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15270,8 +15322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15280,8 +15332,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15290,8 +15342,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15300,8 +15352,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15310,8 +15362,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15320,8 +15372,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15330,8 +15382,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15340,8 +15392,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15350,8 +15402,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15360,8 +15412,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15370,8 +15422,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15380,8 +15432,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15390,8 +15442,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15400,8 +15452,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15410,8 +15462,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15420,8 +15472,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15430,8 +15482,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15440,8 +15492,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15450,8 +15502,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15460,8 +15512,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-342",
-   "self_type" : "type-345",
+   "referenced_type" : "type-350",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15470,8 +15522,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15480,8 +15532,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",
+   "referenced_type" : "type-569",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15490,8 +15542,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15500,8 +15552,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-729",
+   "self_type" : "type-731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15510,8 +15562,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
+   "referenced_type" : "type-799",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15520,8 +15572,8 @@
    "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",
+   "referenced_type" : "type-861",
+   "self_type" : "type-864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15530,8 +15582,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-954",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15540,8 +15592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -15550,8 +15602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15560,8 +15612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-493",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15570,8 +15622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-469",
-   "self_type" : "type-477",
+   "referenced_type" : "type-472",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15580,8 +15632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-734",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15590,8 +15642,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-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-415",
+   "self_type" : "type-414",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15600,8 +15652,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-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-420",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15610,8 +15662,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-633",
-   "self_type" : "type-679",
+   "referenced_type" : "type-628",
+   "self_type" : "type-673",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15620,8 +15672,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-245",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1054",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15630,8 +15682,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<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-239",
-   "self_type" : "type-704",
+   "referenced_type" : "type-246",
+   "self_type" : "type-701",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15640,8 +15692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15650,8 +15702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15660,8 +15712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15670,8 +15722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15680,8 +15732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15690,8 +15742,8 @@
    "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-1774",
+   "self_type" : "type-1773",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15700,8 +15752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "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"
   },
@@ -15710,8 +15762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "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"
   },
@@ -15720,8 +15772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "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"
   },
@@ -15730,8 +15782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15740,8 +15792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "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"
   },
@@ -15750,8 +15802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "type-398",
+   "self_type" : "type-397",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15760,8 +15812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-524",
+   "self_type" : "type-523",
    "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"
   },
@@ -15770,8 +15822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "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"
   },
@@ -15780,8 +15832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15790,8 +15842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
    "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"
   },
@@ -15800,8 +15852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-744",
+   "self_type" : "type-743",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15810,8 +15862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-819",
-   "self_type" : "type-818",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "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"
   },
@@ -15820,8 +15872,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15830,8 +15882,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15840,8 +15892,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-329",
-   "self_type" : "type-334",
+   "referenced_type" : "type-337",
+   "self_type" : "type-341",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15850,8 +15902,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-470",
-   "self_type" : "type-474",
+   "referenced_type" : "type-476",
+   "self_type" : "type-480",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15860,8 +15912,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-552",
-   "self_type" : "type-556",
+   "referenced_type" : "type-560",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15870,8 +15922,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-625",
-   "self_type" : "type-631",
+   "referenced_type" : "type-639",
+   "self_type" : "type-643",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15880,8 +15932,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-709",
-   "self_type" : "type-714",
+   "referenced_type" : "type-717",
+   "self_type" : "type-722",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15890,8 +15942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-337",
+   "referenced_type" : "type-151",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15900,8 +15952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15911,7 +15963,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15920,8 +15972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-413",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15930,8 +15982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15950,8 +16002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15960,8 +16012,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-360",
-   "self_type" : "type-446",
+   "referenced_type" : "type-367",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15970,8 +16022,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-353",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-359",
+   "self_type" : "type-1064",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15980,8 +16032,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15990,8 +16042,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-532",
+   "referenced_type" : "type-20",
+   "self_type" : "type-531",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16010,8 +16062,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-363",
-   "self_type" : "type-805",
+   "referenced_type" : "type-370",
+   "self_type" : "type-813",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16020,8 +16072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-913",
+   "referenced_type" : "type-291",
+   "self_type" : "type-923",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16030,8 +16082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-427",
+   "referenced_type" : "type-273",
+   "self_type" : "type-424",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16040,7 +16092,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
+   "referenced_type" : "type-310",
    "self_type" : "type-328",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16050,8 +16102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-306",
+   "referenced_type" : "type-141",
+   "self_type" : "type-298",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16060,8 +16112,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-359",
-   "self_type" : "type-806",
+   "referenced_type" : "type-366",
+   "self_type" : "type-814",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16070,8 +16122,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-352",
-   "self_type" : "type-395",
+   "referenced_type" : "type-358",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16080,8 +16132,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-130",
-   "self_type" : "type-373",
+   "referenced_type" : "type-136",
+   "self_type" : "type-381",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16090,8 +16142,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-1029",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16100,8 +16152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-952",
+   "referenced_type" : "type-127",
+   "self_type" : "type-963",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16110,8 +16162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-388",
+   "referenced_type" : "type-372",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16120,8 +16172,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-299",
-   "self_type" : "type-727",
+   "referenced_type" : "type-306",
+   "self_type" : "type-739",
    "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"
   },
@@ -16130,8 +16182,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-141",
-   "self_type" : "type-459",
+   "referenced_type" : "type-147",
+   "self_type" : "type-458",
    "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"
   },
@@ -16140,8 +16192,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-24",
-   "self_type" : "type-637",
+   "referenced_type" : "type-31",
+   "self_type" : "type-632",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16150,8 +16202,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-636",
-   "self_type" : "type-684",
+   "referenced_type" : "type-631",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16160,8 +16212,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -16170,8 +16222,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -16180,8 +16232,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-23",
-   "self_type" : "type-976",
+   "referenced_type" : "type-30",
+   "self_type" : "type-985",
    "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"
   },
@@ -16190,8 +16242,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-134",
-   "self_type" : "type-372",
+   "referenced_type" : "type-140",
+   "self_type" : "type-380",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16200,8 +16252,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-975",
-   "self_type" : "type-980",
+   "referenced_type" : "type-984",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16210,8 +16262,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-96",
-   "self_type" : "type-978",
+   "referenced_type" : "type-102",
+   "self_type" : "type-987",
    "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"
   },
@@ -16220,8 +16272,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-63",
-   "self_type" : "type-970",
+   "referenced_type" : "type-70",
+   "self_type" : "type-980",
    "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"
   },
@@ -16230,8 +16282,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -16240,8 +16292,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-22",
-   "self_type" : "type-985",
+   "referenced_type" : "type-29",
+   "self_type" : "type-995",
    "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"
   },
@@ -16250,8 +16302,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -16260,8 +16312,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -16270,8 +16322,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-72",
-   "self_type" : "type-973",
+   "referenced_type" : "type-77",
+   "self_type" : "type-982",
    "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"
   },
@@ -16280,8 +16332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-988",
+   "referenced_type" : "type-51",
+   "self_type" : "type-997",
    "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"
   },
@@ -16290,8 +16342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-922",
+   "referenced_type" : "type-777",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16300,8 +16352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16310,8 +16362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-933",
+   "referenced_type" : "type-937",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16320,8 +16372,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-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16330,8 +16382,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16340,8 +16392,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16350,8 +16402,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-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16360,8 +16412,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-85",
-   "self_type" : "type-775",
+   "referenced_type" : "type-94",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16422,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16380,8 +16432,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16390,8 +16442,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16400,8 +16452,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16410,8 +16462,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16420,8 +16472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-902",
+   "referenced_type" : "type-633",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16429,24 +16481,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
    "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-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "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-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-598",
+   "self_type" : "type-597",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -16454,8 +16506,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-279",
-   "self_type" : "type-893",
+   "referenced_type" : "type-289",
+   "self_type" : "type-903",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16464,8 +16516,8 @@
    "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-282",
-   "self_type" : "type-889",
+   "referenced_type" : "type-292",
+   "self_type" : "type-898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16474,8 +16526,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16494,8 +16546,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16504,8 +16556,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16514,8 +16566,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16525,7 +16577,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16533,216 +16585,208 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "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-1506",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1637",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "source_file" : "/system/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-1750",
+   "self_type" : "type-1749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "source_file" : "/system/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-1898",
+   "self_type" : "type-1897",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16757,56 +16801,64 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "type-355",
+   "self_type" : "type-354",
    "source_file" : "/system/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",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16814,7 +16866,7 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-560",
+   "referenced_type" : "type-557",
    "self_type" : "type-566",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -16824,8 +16876,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16835,7 +16887,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-288",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16896,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16854,8 +16906,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16864,8 +16916,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-1039",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -16874,348 +16926,348 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1074",
-   "size" : 12,
-   "source_file" : "/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-1114",
-   "self_type" : "type-1113",
-   "size" : 12,
-   "source_file" : "/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-1364",
-   "self_type" : "type-1363",
-   "size" : 12,
-   "source_file" : "/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-1427",
-   "self_type" : "type-1426",
-   "size" : 12,
-   "source_file" : "/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-1454",
-   "self_type" : "type-1453",
-   "size" : 12,
-   "source_file" : "/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-147",
-   "self_type" : "type-146",
-   "size" : 12,
-   "source_file" : "/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-1511",
-   "self_type" : "type-1510",
-   "size" : 12,
-   "source_file" : "/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-1536",
-   "self_type" : "type-1535",
-   "size" : 12,
-   "source_file" : "/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-1541",
-   "self_type" : "type-1540",
-   "size" : 12,
-   "source_file" : "/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-1569",
-   "self_type" : "type-1568",
-   "size" : 12,
-   "source_file" : "/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-1593",
-   "self_type" : "type-1592",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-1661",
-   "self_type" : "type-1660",
-   "size" : 12,
-   "source_file" : "/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-1750",
-   "self_type" : "type-1749",
-   "size" : 12,
-   "source_file" : "/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-1827",
-   "self_type" : "type-1826",
-   "size" : 12,
-   "source_file" : "/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-1886",
-   "self_type" : "type-1885",
-   "size" : 12,
-   "source_file" : "/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-1958",
-   "self_type" : "type-1957",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-2083",
-   "self_type" : "type-2082",
-   "size" : 12,
-   "source_file" : "/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-2116",
-   "self_type" : "type-2115",
-   "size" : 12,
-   "source_file" : "/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-2136",
-   "self_type" : "type-2135",
-   "size" : 12,
-   "source_file" : "/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-2200",
-   "self_type" : "type-2199",
-   "size" : 12,
-   "source_file" : "/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-2224",
-   "self_type" : "type-2223",
-   "size" : 12,
-   "source_file" : "/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-2248",
-   "self_type" : "type-2247",
-   "size" : 12,
-   "source_file" : "/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-237",
-   "self_type" : "type-236",
-   "size" : 12,
-   "source_file" : "/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-387",
-   "self_type" : "type-386",
-   "size" : 12,
-   "source_file" : "/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-468",
-   "self_type" : "type-467",
-   "size" : 12,
-   "source_file" : "/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-498",
-   "self_type" : "type-497",
-   "size" : 12,
-   "source_file" : "/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-578",
-   "self_type" : "type-577",
-   "size" : 12,
-   "source_file" : "/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-653",
-   "self_type" : "type-652",
-   "size" : 12,
-   "source_file" : "/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-733",
-   "self_type" : "type-732",
-   "size" : 12,
-   "source_file" : "/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-811",
-   "self_type" : "type-810",
-   "size" : 12,
-   "source_file" : "/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-863",
-   "self_type" : "type-862",
-   "size" : 12,
-   "source_file" : "/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-959",
-   "self_type" : "type-958",
-   "size" : 12,
-   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "referenced_type" : "type-1088",
    "self_type" : "type-1087",
+   "size" : 12,
+   "source_file" : "/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-1315",
+   "self_type" : "type-1314",
+   "size" : 12,
+   "source_file" : "/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-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"
+  },
+  {
+   "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-1445",
+   "self_type" : "type-1444",
+   "size" : 12,
+   "source_file" : "/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-1474",
+   "self_type" : "type-1473",
+   "size" : 12,
+   "source_file" : "/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-14",
+   "self_type" : "type-13",
+   "size" : 12,
+   "source_file" : "/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-1531",
+   "self_type" : "type-1530",
+   "size" : 12,
+   "source_file" : "/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-154",
+   "self_type" : "type-153",
+   "size" : 12,
+   "source_file" : "/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-1551",
+   "self_type" : "type-1550",
+   "size" : 12,
+   "source_file" : "/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-1563",
+   "self_type" : "type-1562",
+   "size" : 12,
+   "source_file" : "/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-1590",
+   "self_type" : "type-1589",
+   "size" : 12,
+   "source_file" : "/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-1612",
+   "self_type" : "type-1611",
+   "size" : 12,
+   "source_file" : "/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-1645",
+   "self_type" : "type-1644",
+   "size" : 12,
+   "source_file" : "/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-1680",
+   "self_type" : "type-1679",
+   "size" : 12,
+   "source_file" : "/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-1771",
+   "self_type" : "type-1770",
+   "size" : 12,
+   "source_file" : "/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-1847",
+   "self_type" : "type-1846",
+   "size" : 12,
+   "source_file" : "/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-1906",
+   "self_type" : "type-1905",
+   "size" : 12,
+   "source_file" : "/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-1978",
+   "self_type" : "type-1977",
+   "size" : 12,
+   "source_file" : "/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-2055",
+   "self_type" : "type-2054",
+   "size" : 12,
+   "source_file" : "/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-2103",
+   "self_type" : "type-2102",
+   "size" : 12,
+   "source_file" : "/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-2137",
+   "self_type" : "type-2136",
+   "size" : 12,
+   "source_file" : "/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-2156",
+   "self_type" : "type-2155",
+   "size" : 12,
+   "source_file" : "/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-2220",
+   "self_type" : "type-2219",
+   "size" : 12,
+   "source_file" : "/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-2246",
+   "self_type" : "type-2245",
+   "size" : 12,
+   "source_file" : "/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-242",
+   "self_type" : "type-241",
+   "size" : 12,
+   "source_file" : "/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-394",
+   "self_type" : "type-393",
+   "size" : 12,
+   "source_file" : "/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-463",
+   "self_type" : "type-462",
+   "size" : 12,
+   "source_file" : "/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-501",
+   "self_type" : "type-500",
+   "size" : 12,
+   "source_file" : "/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-583",
+   "self_type" : "type-582",
+   "size" : 12,
+   "source_file" : "/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-741",
+   "self_type" : "type-740",
+   "size" : 12,
+   "source_file" : "/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-819",
+   "self_type" : "type-818",
+   "size" : 12,
+   "source_file" : "/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-872",
+   "self_type" : "type-871",
+   "size" : 12,
+   "source_file" : "/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-969",
+   "self_type" : "type-968",
+   "size" : 12,
+   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17224,8 +17276,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-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17234,8 +17286,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-1434",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17244,8 +17296,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-1520",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17254,8 +17306,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-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17264,8 +17316,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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17274,8 +17326,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-1666",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17284,8 +17336,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17294,8 +17346,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-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17304,8 +17356,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-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17314,8 +17366,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-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17324,8 +17376,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-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17334,8 +17386,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-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17344,8 +17396,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-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17354,8 +17406,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-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17364,8 +17416,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-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17374,8 +17426,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17384,8 +17436,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-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17394,8 +17446,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-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17404,8 +17456,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-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17414,8 +17466,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-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17424,8 +17476,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-758",
-   "self_type" : "type-757",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17434,8 +17486,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-839",
-   "self_type" : "type-838",
+   "referenced_type" : "type-848",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17444,8 +17496,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-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17454,8 +17506,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "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"
   },
@@ -17464,8 +17516,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1397",
    "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"
   },
@@ -17474,8 +17526,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-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "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"
   },
@@ -17484,8 +17536,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-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
    "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"
   },
@@ -17494,8 +17546,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-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "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"
   },
@@ -17504,8 +17556,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-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
    "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"
   },
@@ -17514,8 +17566,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-1664",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
    "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"
   },
@@ -17524,8 +17576,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -17534,8 +17586,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-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "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"
   },
@@ -17544,8 +17596,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-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "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"
   },
@@ -17554,8 +17606,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-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "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"
   },
@@ -17564,8 +17616,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-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "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"
   },
@@ -17574,8 +17626,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-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "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"
   },
@@ -17584,8 +17636,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-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "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"
   },
@@ -17594,8 +17646,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
    "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"
   },
@@ -17604,8 +17656,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-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "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"
   },
@@ -17614,8 +17666,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -17624,8 +17676,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-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-440",
+   "self_type" : "type-439",
    "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"
   },
@@ -17634,8 +17686,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-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "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"
   },
@@ -17644,8 +17696,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-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "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"
   },
@@ -17654,8 +17706,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-669",
-   "self_type" : "type-668",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "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"
   },
@@ -17664,8 +17716,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-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "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"
   },
@@ -17674,8 +17726,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-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "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"
   },
@@ -17684,8 +17736,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-982",
-   "self_type" : "type-981",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "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"
   },
@@ -17694,8 +17746,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-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1056",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17704,8 +17756,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17714,8 +17766,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-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17724,8 +17776,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-1514",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1532",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17734,8 +17786,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-1548",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17744,8 +17796,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-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17754,8 +17806,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-1628",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17774,8 +17826,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-1761",
-   "self_type" : "type-1760",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17784,8 +17836,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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17794,8 +17846,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-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17804,8 +17856,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-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17814,8 +17866,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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17824,8 +17876,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-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 12,
    "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"
   },
@@ -17834,8 +17886,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-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17844,8 +17896,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-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2226",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17854,8 +17906,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-400",
-   "self_type" : "type-399",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17864,8 +17916,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-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17874,8 +17926,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-581",
-   "self_type" : "type-580",
+   "referenced_type" : "type-585",
+   "self_type" : "type-584",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17884,8 +17936,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-655",
-   "self_type" : "type-654",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17894,8 +17946,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-708",
-   "self_type" : "type-707",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17904,8 +17956,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-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-751",
+   "self_type" : "type-750",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17914,8 +17966,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-816",
-   "self_type" : "type-815",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "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"
   },
@@ -17924,8 +17976,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-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17934,8 +17986,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17944,8 +17996,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17954,8 +18006,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17964,8 +18016,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1497",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17974,8 +18026,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1734",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17984,8 +18036,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-694",
+   "self_type" : "type-693",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17994,8 +18046,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18004,8 +18056,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18014,8 +18066,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-627",
-   "self_type" : "type-626",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18024,8 +18076,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-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18034,8 +18086,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-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18044,8 +18096,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-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18054,8 +18106,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-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18064,8 +18116,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-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18074,8 +18126,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-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18084,8 +18136,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-367",
-   "self_type" : "type-366",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18094,8 +18146,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-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18104,8 +18156,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-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18114,8 +18166,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-651",
-   "self_type" : "type-650",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18124,8 +18176,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18134,8 +18186,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-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18144,8 +18196,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-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18154,8 +18206,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-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18164,8 +18216,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-1881",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18226,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-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18184,8 +18236,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-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18194,8 +18246,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-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18204,8 +18256,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-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18214,8 +18266,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-489",
-   "self_type" : "type-488",
+   "referenced_type" : "type-497",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18224,8 +18276,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-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18234,8 +18286,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-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18244,8 +18296,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-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18254,8 +18306,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-800",
-   "self_type" : "type-799",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18264,8 +18316,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-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18274,8 +18326,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-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1375",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18284,8 +18336,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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1640",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18294,8 +18346,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-1056",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18304,8 +18356,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18314,8 +18366,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18324,8 +18376,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-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18334,8 +18386,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-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18344,8 +18396,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-1457",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18354,8 +18406,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-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,8 +18416,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-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18374,8 +18426,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-1580",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1573",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18384,8 +18436,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-1597",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18394,8 +18446,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-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18404,8 +18456,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-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18414,8 +18466,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-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18424,8 +18476,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-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18434,8 +18486,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-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18444,8 +18496,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-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18454,8 +18506,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-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18464,8 +18516,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-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18474,8 +18526,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-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18484,8 +18536,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-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18494,8 +18546,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18504,8 +18556,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-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18514,8 +18566,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-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
+   "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-221",
+   "self_type" : "type-220",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18534,8 +18596,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18544,8 +18606,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-267",
+   "self_type" : "type-266",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18554,8 +18616,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-451",
-   "self_type" : "type-450",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18564,8 +18626,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-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18574,8 +18636,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-601",
-   "self_type" : "type-600",
+   "referenced_type" : "type-607",
+   "self_type" : "type-606",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18584,8 +18646,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18594,8 +18656,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-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18604,8 +18666,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-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18614,8 +18676,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18624,18 +18686,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-871",
-   "self_type" : "type-870",
-   "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-992",
-   "self_type" : "type-991",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18644,8 +18696,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18655,7 +18707,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18665,7 +18717,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18674,8 +18726,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18683,8 +18735,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-418",
+   "referenced_type" : "type-22",
+   "self_type" : "type-399",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18692,8 +18744,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-884",
+   "referenced_type" : "type-21",
+   "self_type" : "type-895",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -18707,14 +18759,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-877"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
+   "referenced_type" : "type-876",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -18726,17 +18778,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-753"
+     "referenced_type" : "type-762"
     }
    ],
    "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-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-493", "type-768" ],
+   "template_args" : [ "type-489", "type-777" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -18746,17 +18798,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-441"
+     "referenced_type" : "type-436"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -18766,17 +18818,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-726",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-730" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -18786,14 +18838,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-866"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-865",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -18805,14 +18857,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-874"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-873",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -18822,7 +18874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-435"
     }
    ],
    "fields" :
@@ -18831,20 +18883,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -18856,14 +18908,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -18875,14 +18927,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -18894,14 +18946,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -18914,14 +18966,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -18961,8 +19013,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -18972,8 +19024,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -18983,8 +19035,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -19016,8 +19068,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -19028,17 +19080,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-761"
     }
    ],
    "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-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-754" ],
+   "template_args" : [ "type-763" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -19085,14 +19137,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -19150,14 +19202,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -19169,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -19187,7 +19239,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -19196,25 +19248,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-865"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-876"
     },
     {
      "access" : "private",
@@ -19226,19 +19278,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-945"
     },
     {
      "access" : "private",
@@ -19250,8 +19302,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
+   "referenced_type" : "type-947",
+   "self_type" : "type-947",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -19341,17 +19393,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -19396,17 +19448,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-271" ],
+   "template_args" : [ "type-281" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -19451,17 +19503,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-770",
+   "self_type" : "type-770",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-639" ],
+   "template_args" : [ "type-634" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -19506,17 +19558,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-769" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -19563,7 +19615,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
@@ -19575,20 +19627,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -19640,14 +19692,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-726"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-728",
+   "self_type" : "type-728",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -19677,23 +19729,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-416"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-410"
+     "referenced_type" : "type-417"
     }
    ],
    "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-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-404" ],
+   "template_args" : [ "type-292", "type-413" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -19703,23 +19755,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-422"
     }
    ],
    "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-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-16" ],
+   "template_args" : [ "type-292", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -19729,23 +19781,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-634"
+     "referenced_type" : "type-629"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-630"
     }
    ],
    "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-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-636", "type-638" ],
+   "template_args" : [ "type-631", "type-633" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19755,23 +19807,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19781,23 +19833,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19838,18 +19890,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-310"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19931,14 +19983,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-971"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -19950,13 +20002,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -19973,11 +20025,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19985,7 +20037,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -19994,17 +20046,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -20012,7 +20064,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20021,17 +20073,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -20039,7 +20091,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20048,17 +20100,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -20066,7 +20118,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20075,17 +20127,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -20093,7 +20145,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20102,17 +20154,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -20120,7 +20172,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20129,17 +20181,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-639",
+   "self_type" : "type-639",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -20147,7 +20199,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20156,17 +20208,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -20174,7 +20226,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20183,17 +20235,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20201,17 +20253,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20250,34 +20302,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1097",
+   "self_type" : "type-1097",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-415" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1100",
+   "self_type" : "type-1100",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-420" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-713",
+   "self_type" : "type-713",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-628" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1060",
+   "self_type" : "type-1060",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-721",
+   "self_type" : "type-721",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20316,8 +20468,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20329,14 +20481,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20345,8 +20497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20355,8 +20507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20365,8 +20517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
+   "referenced_type" : "type-920",
+   "self_type" : "type-920",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20402,7 +20554,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -20413,8 +20565,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -20443,16 +20595,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-368"
     }
    ],
    "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-360",
-   "self_type" : "type-360",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20461,16 +20613,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-360"
     }
    ],
    "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-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -20479,16 +20631,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -20497,16 +20649,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20516,7 +20668,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20527,8 +20679,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20539,16 +20691,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20558,7 +20710,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -20569,8 +20721,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -20581,16 +20733,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20600,7 +20752,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -20611,8 +20763,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20624,7 +20776,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-369"
     },
     {
      "field_name" : "_pad",
@@ -20635,8 +20787,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20648,7 +20800,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "_pad",
@@ -20659,8 +20811,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20671,13 +20823,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -20690,7 +20842,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -20701,8 +20853,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20713,13 +20865,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -20732,7 +20884,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -20743,8 +20895,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20753,8 +20905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -20772,14 +20924,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -20788,11 +20940,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-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -20802,16 +20954,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -20819,7 +20971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-293"
     }
    ],
    "fields" :
@@ -20828,7 +20980,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
@@ -20840,13 +20992,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 192,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-292"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -20926,13 +21078,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -21014,19 +21166,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -21038,7 +21190,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -21050,13 +21202,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -21068,7 +21220,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -21080,13 +21232,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -21110,13 +21262,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -21129,7 +21281,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
@@ -21141,16 +21293,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -21160,7 +21312,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -21172,16 +21324,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -21191,7 +21343,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -21203,16 +21355,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -21222,7 +21374,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -21234,16 +21386,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -21251,7 +21403,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1040"
     }
    ],
    "fields" :
@@ -21259,14 +21411,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-1027"
+     "referenced_type" : "type-1037"
     }
    ],
    "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-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -21278,7 +21430,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -21290,13 +21442,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -21309,19 +21461,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -21331,10 +21483,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21343,13 +21495,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -21471,10 +21623,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-309"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21483,19 +21635,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-299",
-   "self_type" : "type-299",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "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",
@@ -21678,10 +21830,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21690,19 +21842,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "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",
@@ -21838,13 +21990,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "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"
@@ -21855,13 +22007,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -21970,7 +22122,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21979,13 +22131,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -22107,7 +22259,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -22116,13 +22268,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -22244,10 +22396,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22256,19 +22408,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -22475,10 +22627,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22487,19 +22639,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -22685,10 +22837,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22697,19 +22849,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "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",
@@ -22858,10 +23010,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22870,19 +23022,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "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",
@@ -23010,13 +23162,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -23158,12 +23310,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -23173,18 +23325,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -23194,13 +23346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -23313,7 +23465,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -23322,13 +23474,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -23450,10 +23602,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23462,19 +23614,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -23684,10 +23836,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23696,19 +23848,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "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",
@@ -23860,13 +24012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -24011,7 +24163,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24020,13 +24172,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -24148,7 +24300,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24157,13 +24309,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -24285,10 +24437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24297,19 +24449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -24495,10 +24647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24507,19 +24659,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -24744,10 +24896,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24756,19 +24908,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "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",
@@ -24896,10 +25048,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24908,19 +25060,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "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",
@@ -25087,13 +25239,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -25206,13 +25358,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -25379,17 +25531,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-937" ],
+   "template_args" : [ "type-947" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -25399,17 +25551,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-906" ],
+   "template_args" : [ "type-916" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -25419,17 +25571,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-304" ],
+   "template_args" : [ "type-312" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -25439,17 +25591,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-778"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-780" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -25459,17 +25611,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-319" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -25479,17 +25631,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -25499,17 +25651,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-937",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-940" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -25519,17 +25671,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1012" ],
+   "template_args" : [ "type-1022" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -25539,157 +25691,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-277"
-    }
-   ],
-   "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-276",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-287"
+    }
+   ],
+   "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-286",
+   "self_type" : "type-286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-288" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-290"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-906",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-291" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -25699,69 +25851,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25771,52 +25923,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1118",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1026",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1062",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25826,8 +25978,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25837,85 +25989,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1036",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-933",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1127",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25925,52 +26077,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1009",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-978",
+   "self_type" : "type-978",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25980,8 +26132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25991,85 +26143,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-952",
+   "self_type" : "type-952",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26079,52 +26231,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1114",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-990",
+   "self_type" : "type-990",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26134,8 +26286,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1121",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26145,107 +26297,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1091",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1032",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-493" ],
+   "template_args" : [ "type-489" ],
    "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-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-469" ],
+   "template_args" : [ "type-472" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26255,52 +26407,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1119",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1086",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1027",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26310,8 +26462,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1123",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26321,33 +26473,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -26357,23 +26509,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-633",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-641" ],
+   "template_args" : [ "type-636" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -26383,23 +26535,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-273" ],
+   "template_args" : [ "type-283" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -26409,23 +26561,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -26435,23 +26587,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "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-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -26460,18 +26612,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-858",
+   "self_type" : "type-858",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -26487,18 +26639,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -26509,7 +26661,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-842"
     },
     {
      "field_name" : "num_planes",
@@ -26519,13 +26671,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-835"
+     "referenced_type" : "type-846"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-845",
+   "self_type" : "type-845",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -26536,12 +26688,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-832"
+     "referenced_type" : "type-841"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-824"
+     "referenced_type" : "type-837"
     },
     {
      "field_name" : "bits_per_component",
@@ -26576,8 +26728,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -26588,38 +26740,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-857",
+   "self_type" : "type-857",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -26630,18 +26782,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -26652,17 +26804,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "ystride",
@@ -26682,13 +26834,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -26698,13 +26850,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -26715,35 +26867,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-554"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-553"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     }
    ],
    "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-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "self_type" : "type-558",
    "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)"
@@ -26764,8 +26916,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -26776,12 +26928,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26806,13 +26958,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -26823,12 +26975,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26858,13 +27010,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -26875,12 +27027,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26910,13 +27062,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -26927,12 +27079,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26967,13 +27119,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-556",
+   "self_type" : "type-556",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -27017,8 +27169,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27026,8 +27178,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27035,8 +27187,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-329",
-   "self_type" : "type-332",
+   "referenced_type" : "type-337",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27044,8 +27196,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-470",
-   "self_type" : "type-472",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27053,8 +27205,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-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-560",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27062,8 +27214,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-625",
-   "self_type" : "type-629",
+   "referenced_type" : "type-639",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27071,8 +27223,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-709",
-   "self_type" : "type-712",
+   "referenced_type" : "type-717",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27080,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-340",
+   "referenced_type" : "type-151",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27089,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-688",
+   "referenced_type" : "type-19",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27099,7 +27251,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-1098",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27107,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-413",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27116,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-506",
+   "referenced_type" : "type-20",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27125,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-284",
-   "self_type" : "type-327",
+   "referenced_type" : "type-273",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27134,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-318",
-   "self_type" : "type-339",
+   "referenced_type" : "type-310",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27143,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27152,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-905",
-   "self_type" : "type-920",
+   "referenced_type" : "type-915",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27161,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-768",
-   "self_type" : "type-918",
+   "referenced_type" : "type-777",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27170,8 +27322,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-276",
-   "self_type" : "type-324",
+   "referenced_type" : "type-286",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27179,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-910",
+   "referenced_type" : "type-906",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27188,8 +27340,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-85",
-   "self_type" : "type-994",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27197,8 +27349,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-181",
-   "self_type" : "type-316",
+   "referenced_type" : "type-188",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27206,8 +27358,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-61",
-   "self_type" : "type-321",
+   "referenced_type" : "type-68",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27215,8 +27367,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27224,8 +27376,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-70",
-   "self_type" : "type-621",
+   "referenced_type" : "type-75",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27233,8 +27385,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27242,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-638",
-   "self_type" : "type-673",
+   "referenced_type" : "type-633",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27251,8 +27403,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-282",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-292",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27260,215 +27412,116 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-636",
-   "self_type" : "type-670",
-   "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-1771",
-   "self_type" : "type-1770",
-   "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-1832",
-   "self_type" : "type-1831",
-   "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-1893",
-   "self_type" : "type-1892",
-   "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-1965",
-   "self_type" : "type-1964",
-   "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-2047",
-   "self_type" : "type-2046",
-   "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-2094",
-   "self_type" : "type-2093",
-   "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-420",
-   "self_type" : "type-419",
-   "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-503",
-   "self_type" : "type-502",
-   "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-585",
-   "self_type" : "type-584",
-   "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-662",
-   "self_type" : "type-661",
-   "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-747",
-   "self_type" : "type-746",
-   "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-826",
-   "self_type" : "type-825",
-   "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-1776",
-   "self_type" : "type-1775",
-   "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-1836",
-   "self_type" : "type-1835",
-   "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-1897",
-   "self_type" : "type-1896",
-   "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-1969",
-   "self_type" : "type-1968",
-   "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-2051",
-   "self_type" : "type-2050",
-   "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-2098",
-   "self_type" : "type-2097",
-   "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-425",
-   "self_type" : "type-424",
-   "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-509",
-   "self_type" : "type-508",
-   "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-589",
-   "self_type" : "type-588",
-   "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-666",
+   "referenced_type" : "type-631",
    "self_type" : "type-665",
    "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-751",
-   "self_type" : "type-750",
+   "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-1791",
+   "self_type" : "type-1790",
+   "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-1852",
+   "self_type" : "type-1851",
+   "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-1913",
+   "self_type" : "type-1912",
+   "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-1985",
+   "self_type" : "type-1984",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-2114",
+   "self_type" : "type-2113",
+   "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-426",
+   "self_type" : "type-425",
+   "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-510",
+   "self_type" : "type-509",
+   "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-588",
+   "self_type" : "type-587",
+   "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-667",
+   "self_type" : "type-666",
+   "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-754",
+   "self_type" : "type-753",
+   "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-834",
+   "self_type" : "type-833",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27476,8 +27529,107 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
+   "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-1856",
+   "self_type" : "type-1855",
+   "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-1917",
+   "self_type" : "type-1916",
+   "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-1989",
+   "self_type" : "type-1988",
+   "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-2071",
+   "self_type" : "type-2070",
+   "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-2118",
+   "self_type" : "type-2117",
+   "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-430",
+   "self_type" : "type-429",
+   "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-515",
+   "self_type" : "type-514",
+   "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-592",
+   "self_type" : "type-591",
+   "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-672",
+   "self_type" : "type-671",
+   "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-759",
+   "self_type" : "type-758",
+   "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-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27485,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27494,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27503,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27512,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27521,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2048",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27530,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27539,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27548,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27557,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27566,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27575,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27584,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/arm_armv8-a/source-based/libhidltransport.so.lsdump b/Q/64/arm_armv8-a/source-based/libhidltransport.so.lsdump
index 714c818..cba3630 100644
--- a/Q/64/arm_armv8-a/source-based/libhidltransport.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-549",
+   "referenced_type" : "type-146",
+   "self_type" : "type-546",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-714",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-841",
+   "referenced_type" : "type-25",
+   "self_type" : "type-850",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-364",
+   "referenced_type" : "type-103",
+   "self_type" : "type-371",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-562",
+   "referenced_type" : "type-103",
+   "self_type" : "type-559",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-814",
+   "self_type" : "type-826",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -70,8 +79,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -80,24 +89,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -114,16 +123,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -159,8 +168,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1797,10 +1806,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1809,10 +1814,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1849,10 +1850,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1865,14 +1862,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2717,8 +2706,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-883",
+   "self_type" : "type-883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2735,8 +2724,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2753,8 +2742,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2779,8 +2768,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2809,8 +2798,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2831,8 +2820,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2885,8 +2874,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-939",
-   "self_type" : "type-939",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2939,8 +2928,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2965,8 +2954,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2983,8 +2972,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 4,
    "source_file" : "/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-2",
@@ -3009,11 +2998,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3059,8 +3048,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3113,8 +3102,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3139,8 +3128,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3181,8 +3170,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3423,8 +3412,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3453,8 +3442,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3483,8 +3472,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3525,8 +3514,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3563,8 +3552,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3589,8 +3578,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-797",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3607,8 +3596,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3637,8 +3626,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3731,8 +3720,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3773,8 +3762,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-798",
+   "self_type" : "type-798",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3791,8 +3780,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3821,8 +3810,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3855,8 +3844,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3909,8 +3898,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3926,12 +3915,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     }
    ],
-   "referenced_type" : "type-850",
+   "referenced_type" : "type-859",
    "return_type" : "type-2",
-   "self_type" : "type-850",
+   "self_type" : "type-859",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3944,10 +3933,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1012"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3957,10 +3946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3970,16 +3959,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3989,13 +3978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1139"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4005,13 +3994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1140"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4021,13 +4010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4037,13 +4026,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4053,13 +4042,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4069,10 +4058,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4082,10 +4071,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4095,10 +4084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4108,16 +4097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4126,14 +4115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4144,13 +4133,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-1132"
+     "referenced_type" : "type-1145"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4160,13 +4149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4176,13 +4165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-785"
     },
     {
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4191,16 +4180,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1148"
     }
    ],
    "return_type" : "type-2",
@@ -4213,16 +4202,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
      "default_arg" : true,
@@ -4230,7 +4219,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1149"
     }
    ],
    "return_type" : "type-2",
@@ -4242,16 +4231,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1137"
+     "referenced_type" : "type-1150"
     }
    ],
    "return_type" : "type-2",
@@ -4265,13 +4254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1151"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4280,16 +4269,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1152"
     }
    ],
    "return_type" : "type-2",
@@ -4301,16 +4290,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1140"
+     "referenced_type" : "type-1153"
     }
    ],
    "return_type" : "type-2",
@@ -4322,16 +4311,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1141"
+     "referenced_type" : "type-1154"
     }
    ],
    "return_type" : "type-2",
@@ -4343,16 +4332,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1155"
     }
    ],
    "return_type" : "type-2",
@@ -4364,16 +4353,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-830"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1156"
     }
    ],
    "return_type" : "type-2",
@@ -4387,10 +4376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4400,13 +4389,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4416,19 +4405,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4438,13 +4427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4454,19 +4443,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-817"
+     "referenced_type" : "type-824"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4476,10 +4465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4489,10 +4478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4502,10 +4491,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4514,13 +4503,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4529,19 +4518,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4551,16 +4540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4570,13 +4559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1157"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4586,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1158"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4602,13 +4591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4618,13 +4607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1159"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4633,16 +4622,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1147"
+     "referenced_type" : "type-1160"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,16 +4640,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1148"
+     "referenced_type" : "type-1161"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4670,13 +4659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1162"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4685,16 +4674,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1150"
+     "referenced_type" : "type-1163"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4704,10 +4693,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4717,10 +4706,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4729,16 +4718,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1151"
+     "referenced_type" : "type-1164"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4747,13 +4736,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4762,13 +4751,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-788"
     },
     {
      "referenced_type" : "type-716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4778,10 +4767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4791,16 +4780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4810,13 +4799,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4826,13 +4815,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-305"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4842,14 +4831,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4859,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4878,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1152"
+     "referenced_type" : "type-1165"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4894,13 +4883,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1153"
+     "referenced_type" : "type-1166"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4910,14 +4899,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4927,13 +4916,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4943,13 +4932,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1167"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4959,11 +4948,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     }
    ],
    "return_type" : "type-2",
@@ -4976,13 +4965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1168"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4992,10 +4981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5005,10 +4994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5017,13 +5006,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5033,10 +5022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5046,16 +5035,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5064,14 +5053,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5080,14 +5069,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5098,13 +5087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5114,13 +5103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5130,13 +5119,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5145,16 +5134,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1177"
     }
    ],
    "return_type" : "type-2",
@@ -5167,16 +5156,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "default_arg" : true,
@@ -5184,7 +5173,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-1178"
     }
    ],
    "return_type" : "type-2",
@@ -5198,13 +5187,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5213,16 +5202,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1180"
     }
    ],
    "return_type" : "type-2",
@@ -5234,16 +5223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1181"
     }
    ],
    "return_type" : "type-2",
@@ -5255,16 +5244,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1182"
     }
    ],
    "return_type" : "type-2",
@@ -5276,16 +5265,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1183"
     }
    ],
    "return_type" : "type-2",
@@ -5297,16 +5286,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1171"
+     "referenced_type" : "type-1184"
     }
    ],
    "return_type" : "type-2",
@@ -5320,10 +5309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5332,16 +5321,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1172"
+     "referenced_type" : "type-1185"
     }
    ],
    "return_type" : "type-2",
@@ -5353,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
-     "referenced_type" : "type-1173"
+     "referenced_type" : "type-1186"
     }
    ],
    "return_type" : "type-2",
@@ -5375,13 +5364,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5391,13 +5380,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5407,10 +5396,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5420,10 +5409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5433,10 +5422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5445,16 +5434,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1187"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5464,16 +5453,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5483,13 +5472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1188"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,13 +5488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5515,16 +5504,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5534,13 +5523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5550,13 +5539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1190"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5565,16 +5554,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-1178"
+     "referenced_type" : "type-1191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5584,16 +5573,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1179"
+     "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5602,19 +5591,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5624,13 +5613,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5639,19 +5628,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-1194"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,10 +5650,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5674,10 +5663,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5687,19 +5676,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5709,16 +5698,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5727,22 +5716,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5751,19 +5740,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5773,16 +5762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5792,16 +5781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5811,13 +5800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-1195"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5827,10 +5816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5840,16 +5829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5858,19 +5847,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5879,19 +5868,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5901,13 +5890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1196"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5917,13 +5906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5933,13 +5922,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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,14 +5938,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5966,16 +5955,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5985,13 +5974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6001,13 +5990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6017,14 +6006,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -6034,13 +6023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6050,13 +6039,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6066,11 +6055,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     }
    ],
    "return_type" : "type-2",
@@ -6083,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1187"
+     "referenced_type" : "type-1200"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6099,10 +6088,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6112,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6124,13 +6113,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6140,10 +6129,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6153,16 +6142,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6171,14 +6160,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6187,14 +6176,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "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"
   },
   {
@@ -6205,13 +6194,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-1190"
+     "referenced_type" : "type-1203"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6221,13 +6210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6237,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-465"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6252,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-405"
     },
     {
      "referenced_type" : "type-11"
@@ -6273,10 +6262,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-400"
     },
     {
      "referenced_type" : "type-11"
@@ -6295,16 +6284,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
      "default_arg" : true,
@@ -6312,7 +6301,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1193"
+     "referenced_type" : "type-1206"
     }
    ],
    "return_type" : "type-2",
@@ -6326,13 +6315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6341,16 +6330,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-525"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1208"
     }
    ],
    "return_type" : "type-2",
@@ -6364,10 +6353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6377,13 +6366,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6393,13 +6382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6409,10 +6398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6422,10 +6411,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6435,10 +6424,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6448,16 +6437,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6467,13 +6456,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6483,13 +6472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6499,13 +6488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6515,13 +6504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6531,19 +6520,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,13 +6542,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6568,22 +6557,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-468"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6593,10 +6582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6606,10 +6595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6619,10 +6608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6632,16 +6621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6651,13 +6640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6667,13 +6656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-326"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6683,14 +6672,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6700,16 +6689,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6719,13 +6708,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6735,13 +6724,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6751,14 +6740,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6768,13 +6757,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6784,13 +6773,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6800,11 +6789,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-2",
@@ -6817,13 +6806,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6833,10 +6822,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6846,10 +6835,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6858,13 +6847,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6874,10 +6863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6887,16 +6876,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,14 +6894,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6921,14 +6910,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6937,14 +6926,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "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"
   },
   {
@@ -6955,13 +6944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1206"
+     "referenced_type" : "type-1219"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6971,13 +6960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6987,13 +6976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7003,16 +6992,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
      "default_arg" : true,
@@ -7020,7 +7009,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1212"
+     "referenced_type" : "type-1225"
     }
    ],
    "return_type" : "type-2",
@@ -7034,13 +7023,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1213"
+     "referenced_type" : "type-1226"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7049,16 +7038,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-602"
     },
     {
-     "referenced_type" : "type-1214"
+     "referenced_type" : "type-1227"
     }
    ],
    "return_type" : "type-2",
@@ -7072,10 +7061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7085,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7101,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7117,10 +7106,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7130,10 +7119,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7143,10 +7132,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7156,16 +7145,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7175,13 +7164,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1215"
+     "referenced_type" : "type-1228"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7191,13 +7180,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1216"
+     "referenced_type" : "type-1229"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7207,16 +7196,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7226,13 +7215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7242,13 +7231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1217"
+     "referenced_type" : "type-1230"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7258,16 +7247,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-1231"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7277,13 +7266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1232"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7293,10 +7282,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7306,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7319,19 +7308,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7341,16 +7330,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7360,19 +7349,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7381,22 +7370,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-549"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7406,16 +7395,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7425,16 +7414,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7444,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1233"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7460,10 +7449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7473,16 +7462,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7492,13 +7481,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1234"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7508,13 +7497,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7524,13 +7513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-538"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7540,14 +7529,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7557,16 +7546,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7576,13 +7565,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1235"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7592,13 +7581,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1236"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7608,14 +7597,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7625,13 +7614,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7641,13 +7630,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1237"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7657,11 +7646,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     }
    ],
    "return_type" : "type-2",
@@ -7674,13 +7663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1238"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7690,10 +7679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7703,10 +7692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7715,13 +7704,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7731,10 +7720,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7744,16 +7733,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7762,14 +7751,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7778,14 +7767,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "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"
   },
   {
@@ -7795,14 +7784,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7812,16 +7801,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7831,13 +7820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1226"
+     "referenced_type" : "type-1239"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7847,13 +7836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1227"
+     "referenced_type" : "type-1240"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7863,14 +7852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7880,13 +7869,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7896,13 +7885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1241"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7912,11 +7901,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     }
    ],
    "return_type" : "type-2",
@@ -7929,13 +7918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1229"
+     "referenced_type" : "type-1242"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7945,10 +7934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7958,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7970,13 +7959,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7986,10 +7975,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7999,16 +7988,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8017,14 +8006,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8033,14 +8022,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8049,14 +8038,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8065,14 +8054,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "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"
   },
   {
@@ -8083,13 +8072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-1245"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8099,13 +8088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8115,13 +8104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-618"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8132,13 +8121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8148,13 +8137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8164,13 +8153,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-700"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8180,16 +8169,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
      "default_arg" : true,
@@ -8197,7 +8186,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-1257"
     }
    ],
    "return_type" : "type-2",
@@ -8211,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8226,16 +8215,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-684"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-685"
     },
     {
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-1259"
     }
    ],
    "return_type" : "type-2",
@@ -8249,10 +8238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8262,13 +8251,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8278,13 +8267,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8294,10 +8283,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8307,10 +8296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8320,10 +8309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8333,16 +8322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
      "default_arg" : true,
@@ -8350,7 +8339,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1260"
     }
    ],
    "return_type" : "type-2",
@@ -8364,13 +8353,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1248"
+     "referenced_type" : "type-1261"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8379,16 +8368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1262"
     }
    ],
    "return_type" : "type-2",
@@ -8400,16 +8389,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1263"
     }
    ],
    "return_type" : "type-2",
@@ -8421,16 +8410,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1251"
+     "referenced_type" : "type-1264"
     }
    ],
    "return_type" : "type-2",
@@ -8442,16 +8431,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1265"
     }
    ],
    "return_type" : "type-2",
@@ -8463,16 +8452,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-534"
     },
     {
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-747"
     },
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-748"
     },
     {
-     "referenced_type" : "type-1253"
+     "referenced_type" : "type-1266"
     }
    ],
    "return_type" : "type-2",
@@ -8486,10 +8475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8499,13 +8488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8515,13 +8504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8531,10 +8520,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8544,10 +8533,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8557,10 +8546,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8570,16 +8559,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8589,13 +8578,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1254"
+     "referenced_type" : "type-1267"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8605,13 +8594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1268"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8621,13 +8610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8637,13 +8626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1269"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8652,19 +8641,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8674,13 +8663,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1270"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8690,10 +8679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8703,10 +8692,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8716,10 +8705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8729,16 +8718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8748,16 +8737,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8767,13 +8756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8783,13 +8772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-619"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8799,16 +8788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8818,19 +8807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8840,13 +8829,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1271"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8856,13 +8845,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1272"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8872,16 +8861,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8891,19 +8880,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8913,13 +8902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8929,13 +8918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1273"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8945,16 +8934,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1261"
+     "referenced_type" : "type-1274"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8963,22 +8952,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8987,22 +8976,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9012,13 +9001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1275"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9028,10 +9017,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9041,10 +9030,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9054,22 +9043,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9079,16 +9068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9098,19 +9087,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9120,16 +9109,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9139,16 +9128,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9158,19 +9147,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9179,25 +9168,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9206,19 +9195,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1277"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9227,19 +9216,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-700"
+     "referenced_type" : "type-705"
     },
     {
      "referenced_type" : "type-716"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9249,16 +9238,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9268,16 +9257,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9287,13 +9276,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1265"
+     "referenced_type" : "type-1278"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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,10 +9292,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9316,16 +9305,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-402"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9335,13 +9324,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1279"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9351,13 +9340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9367,13 +9356,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9382,12 +9371,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-299", "type-153" ]
+   "template_args" : [ "type-31", "type-306", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9395,12 +9384,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9408,12 +9397,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9421,12 +9410,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1117"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9434,10 +9423,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-396"
     },
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-615"
     }
    ],
    "return_type" : "type-2",
@@ -9449,10 +9438,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-953"
+     "referenced_type" : "type-961"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     }
    ],
    "return_type" : "type-2",
@@ -9464,10 +9453,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
    "return_type" : "type-2",
@@ -9479,10 +9468,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     }
    ],
-   "return_type" : "type-385",
+   "return_type" : "type-378",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9491,13 +9480,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9512,19 +9501,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9533,10 +9522,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9564,14 +9553,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-976"
     }
    ],
    "return_type" : "type-2",
@@ -9584,10 +9573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9597,16 +9586,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-972"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9615,7 +9604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
      "referenced_type" : "type-2"
@@ -9624,7 +9613,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9639,10 +9628,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9660,10 +9649,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9681,10 +9670,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "type-611"
     },
     {
      "referenced_type" : "type-11"
@@ -9705,10 +9694,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9717,10 +9706,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-431"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9738,10 +9727,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-334"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9759,10 +9748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-313"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-610"
     },
     {
      "referenced_type" : "type-11"
@@ -9780,28 +9769,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-768",
+   "return_type" : "type-777",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9811,13 +9800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
      "referenced_type" : "type-604"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9827,10 +9816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     }
    ],
-   "return_type" : "type-279",
+   "return_type" : "type-289",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9840,19 +9829,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9862,19 +9851,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-287"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-907"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9886,22 +9875,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9910,18 +9899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-329",
+   "return_type" : "type-337",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9929,18 +9918,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-470",
+   "return_type" : "type-476",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9948,18 +9937,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9967,18 +9956,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-552",
+   "return_type" : "type-560",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9986,18 +9975,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-625",
+   "return_type" : "type-639",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10005,18 +9994,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10024,18 +10013,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -10043,18 +10032,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-709",
+   "return_type" : "type-717",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -10062,10 +10051,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-1281",
+   "return_type" : "type-1294",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10074,12 +10063,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10087,12 +10076,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10100,12 +10089,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10113,17 +10102,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10138,13 +10127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10153,18 +10142,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10172,18 +10161,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-507"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10191,18 +10180,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-586"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10210,18 +10199,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-664"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10229,29 +10218,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-752"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10260,19 +10249,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10281,10 +10270,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10293,10 +10282,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10305,10 +10294,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-896"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10320,79 +10309,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1297",
+   "referenced_type" : "type-1310",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1298",
+   "referenced_type" : "type-1311",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-633",
+   "referenced_type" : "type-713",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10402,8 +10391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-865",
+   "referenced_type" : "type-865",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10411,8 +10400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-880",
+   "referenced_type" : "type-885",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10420,8 +10409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-493",
-   "self_type" : "type-517",
+   "referenced_type" : "type-489",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10429,17 +10418,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-469",
+   "referenced_type" : "type-472",
    "self_type" : "type-483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-415",
+   "self_type" : "type-1098",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-420",
+   "self_type" : "type-1101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10447,8 +10454,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10456,8 +10463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10465,8 +10472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10474,8 +10481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-616",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10483,8 +10490,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10492,8 +10499,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10501,8 +10508,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-329",
-   "self_type" : "type-333",
+   "referenced_type" : "type-337",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10510,8 +10517,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-470",
-   "self_type" : "type-473",
+   "referenced_type" : "type-476",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10519,8 +10526,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-552",
-   "self_type" : "type-555",
+   "referenced_type" : "type-560",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10528,8 +10535,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-639",
+   "self_type" : "type-642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10537,8 +10544,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-709",
-   "self_type" : "type-713",
+   "referenced_type" : "type-717",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10546,8 +10553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-405",
+   "referenced_type" : "type-151",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10555,8 +10562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-706",
+   "referenced_type" : "type-19",
+   "self_type" : "type-709",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10573,8 +10580,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-360",
-   "self_type" : "type-445",
+   "referenced_type" : "type-367",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10582,8 +10589,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-353",
-   "self_type" : "type-437",
+   "referenced_type" : "type-359",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10591,8 +10598,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10600,8 +10607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10609,8 +10616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-363",
-   "self_type" : "type-448",
+   "referenced_type" : "type-370",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10618,8 +10625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-318",
-   "self_type" : "type-338",
+   "referenced_type" : "type-310",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10627,8 +10634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-442",
+   "referenced_type" : "type-141",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10636,8 +10643,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-359",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10645,8 +10652,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-352",
-   "self_type" : "type-358",
+   "referenced_type" : "type-358",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10654,8 +10661,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-1029",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10663,8 +10670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10672,8 +10679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10681,8 +10688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-921",
+   "referenced_type" : "type-777",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10690,8 +10697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10699,8 +10706,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-276",
-   "self_type" : "type-325",
+   "referenced_type" : "type-286",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10708,8 +10715,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-85",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10717,8 +10724,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-181",
-   "self_type" : "type-317",
+   "referenced_type" : "type-188",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10726,8 +10733,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-61",
-   "self_type" : "type-320",
+   "referenced_type" : "type-68",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10735,8 +10742,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10744,8 +10751,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-70",
-   "self_type" : "type-624",
+   "referenced_type" : "type-75",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10753,8 +10760,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10762,8 +10769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-638",
-   "self_type" : "type-904",
+   "referenced_type" : "type-633",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10771,8 +10778,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-282",
-   "self_type" : "type-888",
+   "referenced_type" : "type-292",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10780,8 +10787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-512",
+   "referenced_type" : "type-504",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10789,8 +10796,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-477",
-   "self_type" : "type-479",
+   "referenced_type" : "type-474",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10798,8 +10805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10807,8 +10814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10816,8 +10823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10825,8 +10832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "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"
   },
@@ -10834,8 +10841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1925",
    "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"
   },
@@ -10843,8 +10850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1977",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1997",
+   "self_type" : "type-1999",
    "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"
   },
@@ -10852,8 +10859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2059",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10861,8 +10868,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "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"
   },
@@ -10870,8 +10877,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-389",
-   "self_type" : "type-391",
+   "referenced_type" : "type-397",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10879,8 +10886,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-520",
+   "referenced_type" : "type-523",
+   "self_type" : "type-525",
    "size" : 4,
    "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"
   },
@@ -10888,8 +10895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-596",
+   "referenced_type" : "type-599",
+   "self_type" : "type-601",
    "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"
   },
@@ -10897,8 +10904,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-607",
-   "self_type" : "type-612",
+   "referenced_type" : "type-608",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10906,8 +10913,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-674",
-   "self_type" : "type-676",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "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"
   },
@@ -10915,8 +10922,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-738",
+   "referenced_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10924,8 +10931,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-820",
+   "referenced_type" : "type-827",
+   "self_type" : "type-829",
    "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"
   },
@@ -10933,8 +10940,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10942,8 +10949,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10951,8 +10958,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-953",
+   "referenced_type" : "type-90",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10960,8 +10967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-403",
-   "self_type" : "type-402",
+   "referenced_type" : "type-412",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10969,8 +10976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10978,8 +10985,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
+   "referenced_type" : "type-424",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10988,7 +10995,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
    "referenced_type" : "type-328",
-   "self_type" : "type-330",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10996,8 +11003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-313",
+   "referenced_type" : "type-298",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11005,8 +11012,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-806",
-   "self_type" : "type-823",
+   "referenced_type" : "type-814",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11014,8 +11021,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-395",
-   "self_type" : "type-394",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11023,8 +11030,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-373",
-   "self_type" : "type-396",
+   "referenced_type" : "type-381",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11032,8 +11039,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-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11041,8 +11048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-952",
-   "self_type" : "type-956",
+   "referenced_type" : "type-963",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11050,8 +11057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-406",
+   "referenced_type" : "type-389",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11059,8 +11066,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-684",
-   "self_type" : "type-687",
+   "referenced_type" : "type-675",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11068,8 +11075,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-372",
-   "self_type" : "type-443",
+   "referenced_type" : "type-380",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11077,8 +11084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11086,8 +11093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11095,8 +11102,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-275",
-   "self_type" : "type-289",
+   "referenced_type" : "type-285",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11104,8 +11111,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-895",
-   "self_type" : "type-898",
+   "referenced_type" : "type-905",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11113,8 +11120,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-775",
-   "self_type" : "type-887",
+   "referenced_type" : "type-784",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11122,8 +11129,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11131,8 +11138,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11140,8 +11147,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11149,8 +11156,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11158,8 +11165,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11167,8 +11174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-902",
-   "self_type" : "type-903",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11176,8 +11183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11185,8 +11192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11194,7 +11201,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-602",
+   "referenced_type" : "type-597",
    "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
@@ -11203,8 +11210,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-893",
-   "self_type" : "type-894",
+   "referenced_type" : "type-903",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11212,8 +11219,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-889",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-898",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11221,8 +11228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11230,8 +11237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11239,8 +11246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11248,254 +11255,254 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1023",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1035",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1443",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1490",
+   "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-1505",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1528",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1557",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1587",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1639",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1678",
    "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-1749",
+   "self_type" : "type-1751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "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-1879",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1899",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1949",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2047",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2135",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2127",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2149",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2210",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2272",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-368",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-348",
-   "self_type" : "type-350",
+   "self_type" : "type-353",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-487",
+   "referenced_type" : "type-354",
+   "self_type" : "type-356",
    "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",
+   "referenced_type" : "type-493",
+   "self_type" : "type-495",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-647",
+   "referenced_type" : "type-574",
+   "self_type" : "type-576",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-798",
+   "referenced_type" : "type-732",
+   "self_type" : "type-734",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-858",
-   "self_type" : "type-860",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-949",
-   "self_type" : "type-951",
+   "referenced_type" : "type-867",
+   "self_type" : "type-869",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-958",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11503,7 +11510,7 @@
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
    "referenced_type" : "type-566",
-   "self_type" : "type-576",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11511,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11520,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11529,8 +11536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11538,8 +11545,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-1047",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11547,8 +11554,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11556,8 +11563,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-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11565,8 +11572,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-1513",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11574,8 +11581,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-1547",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11583,8 +11590,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-155",
-   "self_type" : "type-157",
+   "referenced_type" : "type-162",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11592,8 +11599,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-1627",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -11602,7 +11609,7 @@
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-1747",
-   "self_type" : "type-1751",
+   "self_type" : "type-1761",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11610,8 +11617,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-1760",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11619,8 +11626,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-1828",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11628,8 +11635,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-1889",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1910",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11637,8 +11644,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-1960",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11646,8 +11653,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-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11655,8 +11662,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-2084",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2106",
    "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"
   },
@@ -11664,8 +11671,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-2138",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11673,8 +11680,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-2206",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11682,8 +11689,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-399",
-   "self_type" : "type-401",
+   "referenced_type" : "type-407",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11691,8 +11698,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-499",
-   "self_type" : "type-501",
+   "referenced_type" : "type-505",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11700,8 +11707,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-580",
-   "self_type" : "type-582",
+   "referenced_type" : "type-584",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11709,8 +11716,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-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-662",
+   "self_type" : "type-664",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11718,8 +11725,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-707",
-   "self_type" : "type-710",
+   "referenced_type" : "type-710",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11727,8 +11734,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-741",
-   "self_type" : "type-744",
+   "referenced_type" : "type-750",
+   "self_type" : "type-752",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11736,8 +11743,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-815",
-   "self_type" : "type-817",
+   "referenced_type" : "type-822",
+   "self_type" : "type-824",
    "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"
   },
@@ -11745,8 +11752,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-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-973",
+   "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -11754,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11763,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11772,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11781,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11790,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1733",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11799,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11808,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11817,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11826,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11835,8 +11842,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-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11844,8 +11851,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-1090",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11853,8 +11860,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-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11862,8 +11869,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-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11871,8 +11878,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-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11880,8 +11887,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-1472",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11889,8 +11896,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-1522",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11898,8 +11905,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-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11907,8 +11914,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-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11916,8 +11923,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-1596",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11925,8 +11932,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-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11934,8 +11941,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-1668",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11943,8 +11950,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-1678",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11952,8 +11959,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-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1688",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11961,8 +11968,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-1847",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11970,8 +11977,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-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11979,8 +11986,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-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11988,8 +11995,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-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11997,8 +12004,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-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12006,8 +12013,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-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12015,8 +12022,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12024,8 +12031,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-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12033,8 +12040,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
+   "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-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12051,8 +12067,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-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12060,8 +12076,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12069,8 +12085,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12078,8 +12094,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-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-529",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12087,8 +12103,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-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12096,8 +12112,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12105,8 +12121,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-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12114,8 +12130,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-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12123,8 +12139,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-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12132,17 +12148,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-870",
-   "self_type" : "type-869",
-   "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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12150,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12159,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12168,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12177,8 +12184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12187,7 +12194,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-466",
+   "self_type" : "type-461",
    "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"
   },
@@ -12195,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-979",
+   "referenced_type" : "type-103",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -12207,8 +12214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-875",
+   "referenced_type" : "type-876",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -12216,8 +12223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-856",
-   "self_type" : "type-861",
+   "referenced_type" : "type-865",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12225,8 +12232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-864",
-   "self_type" : "type-866",
+   "referenced_type" : "type-873",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12234,8 +12241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-878",
+   "referenced_type" : "type-885",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12243,8 +12250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-879",
-   "self_type" : "type-881",
+   "referenced_type" : "type-888",
+   "self_type" : "type-890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12252,8 +12259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-883",
+   "referenced_type" : "type-893",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -12261,8 +12268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12270,8 +12277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12279,8 +12286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12288,8 +12295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12297,8 +12304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12306,8 +12313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12315,8 +12322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12324,339 +12331,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1560",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2022",
-   "self_type" : "type-2021",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/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-946",
-   "self_type" : "type-945",
-   "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-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ScopedTrace *",
-   "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Trace.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-897",
-   "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-1315",
-   "self_type" : "type-1314",
-   "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-1440",
    "self_type" : "type-1439",
    "size" : 4,
@@ -12664,35 +12338,62 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "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-1600",
-   "self_type" : "type-1599",
-   "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-1671",
-   "self_type" : "type-1670",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1673",
    "self_type" : "type-1672",
    "size" : 4,
@@ -12700,100 +12401,262 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1742",
    "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-1800",
-   "self_type" : "type-1799",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1834",
    "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-1855",
-   "self_type" : "type-1854",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "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-1916",
-   "self_type" : "type-1915",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "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-1995",
-   "self_type" : "type-1994",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "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",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "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-260",
-   "self_type" : "type-259",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
    "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-291",
-   "self_type" : "type-290",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "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-455",
-   "self_type" : "type-454",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "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-534",
-   "self_type" : "type-533",
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-487",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/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-646",
+   "self_type" : "type-645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-730",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "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-282",
+   "self_type" : "type-281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-472",
+   "self_type" : "type-484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-728",
+   "self_type" : "type-900",
+   "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-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12801,8 +12664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12810,8 +12673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12819,8 +12682,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "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-1682",
+   "self_type" : "type-1681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12828,8 +12700,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
+   "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-1707",
+   "self_type" : "type-1706",
+   "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-1821",
+   "self_type" : "type-1820",
+   "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-1875",
+   "self_type" : "type-1874",
+   "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-1937",
+   "self_type" : "type-1936",
+   "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-2015",
+   "self_type" : "type-2014",
+   "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-2081",
+   "self_type" : "type-2080",
+   "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-269",
+   "self_type" : "type-268",
+   "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-297",
+   "self_type" : "type-296",
+   "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-460",
+   "self_type" : "type-459",
+   "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-540",
+   "self_type" : "type-539",
+   "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-614",
+   "self_type" : "type-613",
+   "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-635",
+   "self_type" : "type-634",
+   "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-65",
+   "self_type" : "type-64",
+   "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-698",
+   "self_type" : "type-697",
+   "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,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12837,8 +12844,8 @@
    "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-408",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-415",
+   "self_type" : "type-1092",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12846,8 +12853,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-413",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-420",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12855,8 +12862,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-633",
-   "self_type" : "type-667",
+   "referenced_type" : "type-628",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12864,8 +12871,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-245",
-   "self_type" : "type-423",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12873,8 +12880,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-239",
-   "self_type" : "type-417",
+   "referenced_type" : "type-246",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12891,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12900,8 +12907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12909,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12918,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12927,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12936,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12945,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12963,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12972,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12981,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12990,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12999,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13008,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13017,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13026,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2001",
-   "self_type" : "type-2000",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13035,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13044,8 +13051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13053,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13062,17 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
-   "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-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13089,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13098,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13107,8 +13105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13116,8 +13114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13125,8 +13123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13134,8 +13132,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13143,8 +13141,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
+   "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-704",
+   "self_type" : "type-703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13161,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13170,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-996",
-   "self_type" : "type-995",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13179,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13188,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13197,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13206,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13215,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13224,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13233,8 +13240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13242,8 +13249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13251,8 +13258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13260,8 +13267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13269,8 +13276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13278,8 +13285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13287,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13296,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13305,8 +13312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13314,8 +13321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13323,8 +13330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13332,8 +13339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13341,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13350,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13359,8 +13366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13368,8 +13375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13377,8 +13384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-700",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13386,8 +13393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13395,8 +13402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-963",
+   "referenced_type" : "type-970",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13404,8 +13411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13413,8 +13420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13422,8 +13429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1758",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1779",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13431,8 +13438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "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"
   },
@@ -13440,8 +13447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "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"
   },
@@ -13449,8 +13456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "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"
   },
@@ -13458,8 +13465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2041",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13467,8 +13474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "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"
   },
@@ -13476,8 +13483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13485,8 +13492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "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"
   },
@@ -13494,8 +13501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-603",
+   "self_type" : "type-602",
    "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"
   },
@@ -13503,8 +13510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-612",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13512,8 +13519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "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"
   },
@@ -13521,8 +13528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-740",
-   "self_type" : "type-739",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13530,8 +13537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
+   "referenced_type" : "type-831",
+   "self_type" : "type-830",
    "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"
   },
@@ -13539,8 +13546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13548,8 +13555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13557,8 +13564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13566,8 +13573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13575,8 +13582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13584,8 +13591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13593,8 +13600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13602,8 +13609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13611,8 +13618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13620,8 +13627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13629,8 +13636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13638,8 +13645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13647,8 +13654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13656,8 +13663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13665,8 +13672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +13681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13683,8 +13690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13692,8 +13699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-627",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13701,8 +13708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13710,8 +13717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13719,8 +13726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13728,8 +13735,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13737,8 +13744,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13746,8 +13753,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-329",
-   "self_type" : "type-331",
+   "referenced_type" : "type-337",
+   "self_type" : "type-338",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13755,8 +13762,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-470",
-   "self_type" : "type-471",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13764,8 +13771,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-552",
-   "self_type" : "type-553",
+   "referenced_type" : "type-560",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13773,8 +13780,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-625",
-   "self_type" : "type-628",
+   "referenced_type" : "type-639",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13782,8 +13789,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-709",
-   "self_type" : "type-711",
+   "referenced_type" : "type-717",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13791,8 +13798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-297",
+   "referenced_type" : "type-151",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13800,8 +13807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-657",
+   "referenced_type" : "type-19",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13810,7 +13817,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-940",
+   "self_type" : "type-950",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +13825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13827,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13836,16 +13843,61 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-1097",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1100",
+   "self_type" : "type-1102",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-713",
+   "self_type" : "type-715",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1060",
+   "self_type" : "type-1062",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-721",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
+   "referenced_type" : "type-56",
    "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -13854,8 +13906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13863,8 +13915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13872,8 +13924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-72",
+   "self_type" : "type-71",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13881,8 +13933,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-360",
-   "self_type" : "type-444",
+   "referenced_type" : "type-367",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13890,8 +13942,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-353",
-   "self_type" : "type-436",
+   "referenced_type" : "type-359",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13899,8 +13951,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-131",
-   "self_type" : "type-159",
+   "referenced_type" : "type-137",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +13960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13917,7 +13969,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
+   "referenced_type" : "type-20",
    "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -13926,8 +13978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-370",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13935,8 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13944,8 +13996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13953,8 +14005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-322",
+   "referenced_type" : "type-310",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13962,8 +14014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-355",
+   "referenced_type" : "type-141",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13971,8 +14023,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-359",
-   "self_type" : "type-365",
+   "referenced_type" : "type-366",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13980,8 +14032,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-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-358",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13989,8 +14041,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-130",
-   "self_type" : "type-142",
+   "referenced_type" : "type-136",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13998,8 +14050,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-1029",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14007,8 +14059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14016,8 +14068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14025,8 +14077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-536",
+   "referenced_type" : "type-160",
+   "self_type" : "type-534",
    "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"
   },
@@ -14034,8 +14086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14043,8 +14095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14052,8 +14104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14061,8 +14113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
    "size" : 4,
    "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"
   },
@@ -14070,8 +14122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "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"
   },
@@ -14079,8 +14131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-296",
+   "referenced_type" : "type-192",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14088,8 +14140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-319",
+   "referenced_type" : "type-181",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14097,8 +14149,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-299",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14106,8 +14158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-458",
+   "referenced_type" : "type-464",
+   "self_type" : "type-465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14115,8 +14167,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14124,8 +14176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14133,8 +14185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14142,8 +14194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "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"
   },
@@ -14151,8 +14203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-538",
+   "referenced_type" : "type-200",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14160,8 +14212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-537",
+   "referenced_type" : "type-542",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14169,8 +14221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14178,8 +14230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
    "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"
   },
@@ -14187,8 +14239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
    "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"
   },
@@ -14196,8 +14248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-611",
+   "referenced_type" : "type-209",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14205,8 +14257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14214,8 +14266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-610",
+   "referenced_type" : "type-617",
+   "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14223,8 +14275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14232,8 +14284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14241,8 +14293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14250,8 +14302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-905",
-   "self_type" : "type-938",
+   "referenced_type" : "type-915",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14259,8 +14311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-305",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14268,8 +14320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-917",
+   "referenced_type" : "type-777",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14277,8 +14329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14286,8 +14338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-932",
+   "referenced_type" : "type-937",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14295,8 +14347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14304,357 +14356,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-276",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-998",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-1007",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-638",
-   "self_type" : "type-901",
-   "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-268",
-   "self_type" : "type-274",
-   "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-279",
-   "self_type" : "type-892",
-   "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-282",
-   "self_type" : "type-886",
-   "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-831",
-   "self_type" : "type-835",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-379",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "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-477",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-407",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-412",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-679",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1044",
-   "self_type" : "type-1046",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-704",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1493",
-   "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-2011",
-   "self_type" : "type-2015",
-   "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-924",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-334",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-556",
-   "self_type" : "type-557",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-631",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-714",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1325",
-   "self_type" : "type-1327",
-   "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-1607",
-   "self_type" : "type-1609",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -14662,10 +14363,361 @@
   },
   {
    "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-286",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-906",
+   "self_type" : "type-918",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-1007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-1014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-1010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-1016",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-1012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-633",
+   "self_type" : "type-910",
+   "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-278",
+   "self_type" : "type-284",
+   "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-289",
+   "self_type" : "type-902",
+   "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-292",
+   "self_type" : "type-892",
+   "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-840",
+   "self_type" : "type-846",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-504",
+   "self_type" : "type-508",
+   "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-474",
+   "self_type" : "type-475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-414",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-419",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-673",
+   "self_type" : "type-674",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1054",
+   "self_type" : "type-1055",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-701",
+   "self_type" : "type-702",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1512",
+   "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-2031",
+   "self_type" : "type-2033",
+   "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-934",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-341",
+   "self_type" : "type-342",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-480",
+   "self_type" : "type-481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-564",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-643",
+   "self_type" : "type-644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-722",
+   "self_type" : "type-723",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-344",
+   "self_type" : "type-953",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1345",
+   "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-1628",
+   "self_type" : "type-1630",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-446",
-   "self_type" : "type-447",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14673,8 +14725,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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14682,8 +14734,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14691,8 +14743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-969",
+   "referenced_type" : "type-132",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14700,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-558",
+   "referenced_type" : "type-531",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14709,8 +14761,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-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14718,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-914",
+   "referenced_type" : "type-923",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14728,7 +14780,7 @@
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
    "referenced_type" : "type-328",
-   "self_type" : "type-341",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14736,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14745,8 +14797,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-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-814",
+   "self_type" : "type-815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14754,8 +14806,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-395",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-403",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14763,8 +14815,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-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14772,8 +14824,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-1034",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14781,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-955",
+   "referenced_type" : "type-963",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,7 +14842,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-389",
    "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -14799,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-727",
-   "self_type" : "type-731",
+   "referenced_type" : "type-739",
+   "self_type" : "type-742",
    "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"
   },
@@ -14808,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-632",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14817,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -14826,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -14835,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-977",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14844,8 +14896,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-372",
-   "self_type" : "type-371",
+   "referenced_type" : "type-380",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14853,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-970",
-   "self_type" : "type-972",
+   "referenced_type" : "type-980",
+   "self_type" : "type-981",
    "size" : 4,
    "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"
   },
@@ -14862,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -14871,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-985",
-   "self_type" : "type-987",
+   "referenced_type" : "type-995",
+   "self_type" : "type-996",
    "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"
   },
@@ -14880,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -14889,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -14898,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-974",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "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"
   },
@@ -14907,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-988",
-   "self_type" : "type-989",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "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"
   },
@@ -14916,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-923",
+   "referenced_type" : "type-931",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14925,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-934",
+   "referenced_type" : "type-942",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14934,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14943,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14952,8 +15004,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-275",
-   "self_type" : "type-326",
+   "referenced_type" : "type-285",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14961,8 +15013,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-895",
-   "self_type" : "type-912",
+   "referenced_type" : "type-905",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,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-775",
-   "self_type" : "type-916",
+   "referenced_type" : "type-784",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14979,8 +15031,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-223",
-   "self_type" : "type-999",
+   "referenced_type" : "type-230",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14988,8 +15040,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-60",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14997,8 +15049,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-30",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-37",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15006,8 +15058,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-69",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-74",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15015,8 +15067,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-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-48",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15024,8 +15076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-902",
-   "self_type" : "type-907",
+   "referenced_type" : "type-912",
+   "self_type" : "type-917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15033,8 +15085,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-893",
-   "self_type" : "type-899",
+   "referenced_type" : "type-903",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15042,8 +15094,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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-898",
+   "self_type" : "type-899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15051,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15060,8 +15112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-491",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15069,8 +15121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-370",
+   "referenced_type" : "type-158",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15079,7 +15131,7 @@
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
    "referenced_type" : "type-566",
-   "self_type" : "type-575",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15087,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15096,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-381",
+   "referenced_type" : "type-122",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15105,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-426",
+   "referenced_type" : "type-399",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15114,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-850",
-   "self_type" : "type-851",
+   "referenced_type" : "type-859",
+   "self_type" : "type-860",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -15124,7 +15176,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15132,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-560",
-   "self_type" : "type-579",
+   "referenced_type" : "type-557",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15142,7 +15194,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15150,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-832",
+   "referenced_type" : "type-103",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -15160,7 +15212,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-393",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15168,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-735",
+   "referenced_type" : "type-22",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15177,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-735",
-   "self_type" : "type-852",
+   "referenced_type" : "type-746",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -15190,8 +15242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15200,8 +15252,8 @@
    "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",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15210,8 +15262,8 @@
    "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",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15220,8 +15272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15230,8 +15282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15240,8 +15292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15250,8 +15302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15260,8 +15312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15270,8 +15322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15280,8 +15332,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15290,8 +15342,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15300,8 +15352,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15310,8 +15362,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15320,8 +15372,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15330,8 +15382,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15340,8 +15392,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15350,8 +15402,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15360,8 +15412,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15370,8 +15422,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15380,8 +15432,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15390,8 +15442,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15400,8 +15452,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15410,8 +15462,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15420,8 +15472,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15430,8 +15482,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15440,8 +15492,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15450,8 +15502,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15460,8 +15512,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-342",
-   "self_type" : "type-345",
+   "referenced_type" : "type-350",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15470,8 +15522,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15480,8 +15532,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",
+   "referenced_type" : "type-569",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15490,8 +15542,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "referenced_type" : "type-645",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15500,8 +15552,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-729",
+   "self_type" : "type-731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15510,8 +15562,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
+   "referenced_type" : "type-799",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15520,8 +15572,8 @@
    "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",
+   "referenced_type" : "type-861",
+   "self_type" : "type-864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15530,8 +15582,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-954",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15540,8 +15592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -15550,8 +15602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15560,8 +15612,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-493",
-   "self_type" : "type-510",
+   "referenced_type" : "type-489",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15570,8 +15622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-469",
-   "self_type" : "type-477",
+   "referenced_type" : "type-472",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15580,8 +15632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-734",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-755",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15590,8 +15642,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-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-415",
+   "self_type" : "type-414",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15600,8 +15652,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-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-420",
+   "self_type" : "type-419",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15610,8 +15662,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-633",
-   "self_type" : "type-679",
+   "referenced_type" : "type-628",
+   "self_type" : "type-673",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15620,8 +15672,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-245",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-252",
+   "self_type" : "type-1054",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15630,8 +15682,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<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-239",
-   "self_type" : "type-704",
+   "referenced_type" : "type-246",
+   "self_type" : "type-701",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15640,8 +15692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15650,8 +15702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15660,8 +15712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15670,8 +15722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15680,8 +15732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15690,8 +15742,8 @@
    "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-1774",
+   "self_type" : "type-1773",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15700,8 +15752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "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"
   },
@@ -15710,8 +15762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "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"
   },
@@ -15720,8 +15772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "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"
   },
@@ -15730,8 +15782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15740,8 +15792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "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"
   },
@@ -15750,8 +15802,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "type-398",
+   "self_type" : "type-397",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15760,8 +15812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-524",
+   "self_type" : "type-523",
    "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"
   },
@@ -15770,8 +15822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "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"
   },
@@ -15780,8 +15832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15790,8 +15842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
    "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"
   },
@@ -15800,8 +15852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-744",
+   "self_type" : "type-743",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15810,8 +15862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-819",
-   "self_type" : "type-818",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "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"
   },
@@ -15820,8 +15872,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15830,8 +15882,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15840,8 +15892,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-329",
-   "self_type" : "type-334",
+   "referenced_type" : "type-337",
+   "self_type" : "type-341",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15850,8 +15902,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-470",
-   "self_type" : "type-474",
+   "referenced_type" : "type-476",
+   "self_type" : "type-480",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15860,8 +15912,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-552",
-   "self_type" : "type-556",
+   "referenced_type" : "type-560",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15870,8 +15922,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-625",
-   "self_type" : "type-631",
+   "referenced_type" : "type-639",
+   "self_type" : "type-643",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15880,8 +15932,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-709",
-   "self_type" : "type-714",
+   "referenced_type" : "type-717",
+   "self_type" : "type-722",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15890,8 +15942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-337",
+   "referenced_type" : "type-151",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15900,8 +15952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15911,7 +15963,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15920,8 +15972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-413",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15930,8 +15982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15940,8 +15992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15950,8 +16002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15960,8 +16012,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-360",
-   "self_type" : "type-446",
+   "referenced_type" : "type-367",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15970,8 +16022,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-353",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-359",
+   "self_type" : "type-1064",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15980,8 +16032,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15990,8 +16042,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-532",
+   "referenced_type" : "type-20",
+   "self_type" : "type-531",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16010,8 +16062,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-363",
-   "self_type" : "type-805",
+   "referenced_type" : "type-370",
+   "self_type" : "type-813",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16020,8 +16072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-913",
+   "referenced_type" : "type-291",
+   "self_type" : "type-923",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16030,8 +16082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-427",
+   "referenced_type" : "type-273",
+   "self_type" : "type-424",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16040,7 +16092,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
+   "referenced_type" : "type-310",
    "self_type" : "type-328",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16050,8 +16102,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-306",
+   "referenced_type" : "type-141",
+   "self_type" : "type-298",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16060,8 +16112,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-359",
-   "self_type" : "type-806",
+   "referenced_type" : "type-366",
+   "self_type" : "type-814",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16070,8 +16122,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-352",
-   "self_type" : "type-395",
+   "referenced_type" : "type-358",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16080,8 +16132,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-130",
-   "self_type" : "type-373",
+   "referenced_type" : "type-136",
+   "self_type" : "type-381",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16090,8 +16142,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-1029",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16100,8 +16152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-952",
+   "referenced_type" : "type-127",
+   "self_type" : "type-963",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16110,8 +16162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-388",
+   "referenced_type" : "type-372",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16120,8 +16172,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-299",
-   "self_type" : "type-727",
+   "referenced_type" : "type-306",
+   "self_type" : "type-739",
    "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"
   },
@@ -16130,8 +16182,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-141",
-   "self_type" : "type-459",
+   "referenced_type" : "type-147",
+   "self_type" : "type-458",
    "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"
   },
@@ -16140,8 +16192,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-24",
-   "self_type" : "type-637",
+   "referenced_type" : "type-31",
+   "self_type" : "type-632",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16150,8 +16202,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-636",
-   "self_type" : "type-684",
+   "referenced_type" : "type-631",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16160,8 +16212,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -16170,8 +16222,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -16180,8 +16232,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-23",
-   "self_type" : "type-976",
+   "referenced_type" : "type-30",
+   "self_type" : "type-985",
    "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"
   },
@@ -16190,8 +16242,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-134",
-   "self_type" : "type-372",
+   "referenced_type" : "type-140",
+   "self_type" : "type-380",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16200,8 +16252,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-975",
-   "self_type" : "type-980",
+   "referenced_type" : "type-984",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16210,8 +16262,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-96",
-   "self_type" : "type-978",
+   "referenced_type" : "type-102",
+   "self_type" : "type-987",
    "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"
   },
@@ -16220,8 +16272,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-63",
-   "self_type" : "type-970",
+   "referenced_type" : "type-70",
+   "self_type" : "type-980",
    "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"
   },
@@ -16230,8 +16282,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -16240,8 +16292,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-22",
-   "self_type" : "type-985",
+   "referenced_type" : "type-29",
+   "self_type" : "type-995",
    "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"
   },
@@ -16250,8 +16302,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -16260,8 +16312,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -16270,8 +16322,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-72",
-   "self_type" : "type-973",
+   "referenced_type" : "type-77",
+   "self_type" : "type-982",
    "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"
   },
@@ -16280,8 +16332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-988",
+   "referenced_type" : "type-51",
+   "self_type" : "type-997",
    "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"
   },
@@ -16290,8 +16342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-922",
+   "referenced_type" : "type-777",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16300,8 +16352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16310,8 +16362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-933",
+   "referenced_type" : "type-937",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16320,8 +16372,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-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16330,8 +16382,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16340,8 +16392,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16350,8 +16402,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-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16360,8 +16412,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-85",
-   "self_type" : "type-775",
+   "referenced_type" : "type-94",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16422,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16380,8 +16432,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16390,8 +16442,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16400,8 +16452,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16410,8 +16462,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16420,8 +16472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-902",
+   "referenced_type" : "type-633",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16429,24 +16481,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1478",
    "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-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "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-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-598",
+   "self_type" : "type-597",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -16454,8 +16506,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-279",
-   "self_type" : "type-893",
+   "referenced_type" : "type-289",
+   "self_type" : "type-903",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16464,8 +16516,8 @@
    "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-282",
-   "self_type" : "type-889",
+   "referenced_type" : "type-292",
+   "self_type" : "type-898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16474,8 +16526,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16494,8 +16546,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16504,8 +16556,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16514,8 +16566,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16525,7 +16577,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16533,216 +16585,208 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "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-1506",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1555",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1637",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "source_file" : "/system/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-1750",
+   "self_type" : "type-1749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "source_file" : "/system/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-1898",
+   "self_type" : "type-1897",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2073",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16757,56 +16801,64 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "type-355",
+   "self_type" : "type-354",
    "source_file" : "/system/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",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16814,7 +16866,7 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-560",
+   "referenced_type" : "type-557",
    "self_type" : "type-566",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -16824,8 +16876,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16835,7 +16887,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-288",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16896,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16854,8 +16906,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16864,8 +16916,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-1039",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -16874,348 +16926,348 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1074",
-   "size" : 12,
-   "source_file" : "/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-1114",
-   "self_type" : "type-1113",
-   "size" : 12,
-   "source_file" : "/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-1364",
-   "self_type" : "type-1363",
-   "size" : 12,
-   "source_file" : "/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-1427",
-   "self_type" : "type-1426",
-   "size" : 12,
-   "source_file" : "/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-1454",
-   "self_type" : "type-1453",
-   "size" : 12,
-   "source_file" : "/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-147",
-   "self_type" : "type-146",
-   "size" : 12,
-   "source_file" : "/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-1511",
-   "self_type" : "type-1510",
-   "size" : 12,
-   "source_file" : "/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-1536",
-   "self_type" : "type-1535",
-   "size" : 12,
-   "source_file" : "/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-1541",
-   "self_type" : "type-1540",
-   "size" : 12,
-   "source_file" : "/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-1569",
-   "self_type" : "type-1568",
-   "size" : 12,
-   "source_file" : "/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-1593",
-   "self_type" : "type-1592",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-1661",
-   "self_type" : "type-1660",
-   "size" : 12,
-   "source_file" : "/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-1750",
-   "self_type" : "type-1749",
-   "size" : 12,
-   "source_file" : "/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-1827",
-   "self_type" : "type-1826",
-   "size" : 12,
-   "source_file" : "/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-1886",
-   "self_type" : "type-1885",
-   "size" : 12,
-   "source_file" : "/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-1958",
-   "self_type" : "type-1957",
-   "size" : 12,
-   "source_file" : "/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-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"
-  },
-  {
-   "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-2083",
-   "self_type" : "type-2082",
-   "size" : 12,
-   "source_file" : "/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-2116",
-   "self_type" : "type-2115",
-   "size" : 12,
-   "source_file" : "/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-2136",
-   "self_type" : "type-2135",
-   "size" : 12,
-   "source_file" : "/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-2200",
-   "self_type" : "type-2199",
-   "size" : 12,
-   "source_file" : "/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-2224",
-   "self_type" : "type-2223",
-   "size" : 12,
-   "source_file" : "/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-2248",
-   "self_type" : "type-2247",
-   "size" : 12,
-   "source_file" : "/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-237",
-   "self_type" : "type-236",
-   "size" : 12,
-   "source_file" : "/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-387",
-   "self_type" : "type-386",
-   "size" : 12,
-   "source_file" : "/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-468",
-   "self_type" : "type-467",
-   "size" : 12,
-   "source_file" : "/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-498",
-   "self_type" : "type-497",
-   "size" : 12,
-   "source_file" : "/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-578",
-   "self_type" : "type-577",
-   "size" : 12,
-   "source_file" : "/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-653",
-   "self_type" : "type-652",
-   "size" : 12,
-   "source_file" : "/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-733",
-   "self_type" : "type-732",
-   "size" : 12,
-   "source_file" : "/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-811",
-   "self_type" : "type-810",
-   "size" : 12,
-   "source_file" : "/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-863",
-   "self_type" : "type-862",
-   "size" : 12,
-   "source_file" : "/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-959",
-   "self_type" : "type-958",
-   "size" : 12,
-   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "referenced_type" : "type-1088",
    "self_type" : "type-1087",
+   "size" : 12,
+   "source_file" : "/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-1315",
+   "self_type" : "type-1314",
+   "size" : 12,
+   "source_file" : "/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-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"
+  },
+  {
+   "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-1445",
+   "self_type" : "type-1444",
+   "size" : 12,
+   "source_file" : "/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-1474",
+   "self_type" : "type-1473",
+   "size" : 12,
+   "source_file" : "/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-14",
+   "self_type" : "type-13",
+   "size" : 12,
+   "source_file" : "/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-1531",
+   "self_type" : "type-1530",
+   "size" : 12,
+   "source_file" : "/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-154",
+   "self_type" : "type-153",
+   "size" : 12,
+   "source_file" : "/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-1551",
+   "self_type" : "type-1550",
+   "size" : 12,
+   "source_file" : "/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-1563",
+   "self_type" : "type-1562",
+   "size" : 12,
+   "source_file" : "/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-1590",
+   "self_type" : "type-1589",
+   "size" : 12,
+   "source_file" : "/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-1612",
+   "self_type" : "type-1611",
+   "size" : 12,
+   "source_file" : "/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-1645",
+   "self_type" : "type-1644",
+   "size" : 12,
+   "source_file" : "/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-1680",
+   "self_type" : "type-1679",
+   "size" : 12,
+   "source_file" : "/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-1771",
+   "self_type" : "type-1770",
+   "size" : 12,
+   "source_file" : "/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-1847",
+   "self_type" : "type-1846",
+   "size" : 12,
+   "source_file" : "/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-1906",
+   "self_type" : "type-1905",
+   "size" : 12,
+   "source_file" : "/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-1978",
+   "self_type" : "type-1977",
+   "size" : 12,
+   "source_file" : "/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-2055",
+   "self_type" : "type-2054",
+   "size" : 12,
+   "source_file" : "/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-2103",
+   "self_type" : "type-2102",
+   "size" : 12,
+   "source_file" : "/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-2137",
+   "self_type" : "type-2136",
+   "size" : 12,
+   "source_file" : "/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-2156",
+   "self_type" : "type-2155",
+   "size" : 12,
+   "source_file" : "/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-2220",
+   "self_type" : "type-2219",
+   "size" : 12,
+   "source_file" : "/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-2246",
+   "self_type" : "type-2245",
+   "size" : 12,
+   "source_file" : "/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-242",
+   "self_type" : "type-241",
+   "size" : 12,
+   "source_file" : "/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-394",
+   "self_type" : "type-393",
+   "size" : 12,
+   "source_file" : "/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-463",
+   "self_type" : "type-462",
+   "size" : 12,
+   "source_file" : "/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-501",
+   "self_type" : "type-500",
+   "size" : 12,
+   "source_file" : "/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-583",
+   "self_type" : "type-582",
+   "size" : 12,
+   "source_file" : "/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-741",
+   "self_type" : "type-740",
+   "size" : 12,
+   "source_file" : "/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-819",
+   "self_type" : "type-818",
+   "size" : 12,
+   "source_file" : "/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-872",
+   "self_type" : "type-871",
+   "size" : 12,
+   "source_file" : "/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-969",
+   "self_type" : "type-968",
+   "size" : 12,
+   "source_file" : "/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::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17224,8 +17276,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-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17234,8 +17286,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-1434",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17244,8 +17296,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-1520",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17254,8 +17306,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-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17264,8 +17316,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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17274,8 +17326,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-1666",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17284,8 +17336,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17294,8 +17346,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-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17304,8 +17356,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-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17314,8 +17366,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-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17324,8 +17376,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-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17334,8 +17386,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-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17344,8 +17396,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-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17354,8 +17406,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-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17364,8 +17416,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-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17374,8 +17426,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17384,8 +17436,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-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17394,8 +17446,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-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17404,8 +17456,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-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17414,8 +17466,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-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17424,8 +17476,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-758",
-   "self_type" : "type-757",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17434,8 +17486,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-839",
-   "self_type" : "type-838",
+   "referenced_type" : "type-848",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17444,8 +17496,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-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -17454,8 +17506,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "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"
   },
@@ -17464,8 +17516,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1397",
    "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"
   },
@@ -17474,8 +17526,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-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "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"
   },
@@ -17484,8 +17536,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-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1536",
    "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"
   },
@@ -17494,8 +17546,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-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "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"
   },
@@ -17504,8 +17556,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-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1655",
    "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"
   },
@@ -17514,8 +17566,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-1664",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
    "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"
   },
@@ -17524,8 +17576,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -17534,8 +17586,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-1779",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "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"
   },
@@ -17544,8 +17596,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-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "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"
   },
@@ -17554,8 +17606,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-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "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"
   },
@@ -17564,8 +17616,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-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "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"
   },
@@ -17574,8 +17626,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-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "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"
   },
@@ -17584,8 +17636,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-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "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"
   },
@@ -17594,8 +17646,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-2152",
-   "self_type" : "type-2151",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
    "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"
   },
@@ -17604,8 +17656,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-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "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"
   },
@@ -17614,8 +17666,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -17624,8 +17676,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-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-440",
+   "self_type" : "type-439",
    "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"
   },
@@ -17634,8 +17686,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-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "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"
   },
@@ -17644,8 +17696,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-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "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"
   },
@@ -17654,8 +17706,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-669",
-   "self_type" : "type-668",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "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"
   },
@@ -17664,8 +17716,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-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "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"
   },
@@ -17674,8 +17726,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-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "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"
   },
@@ -17684,8 +17736,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-982",
-   "self_type" : "type-981",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "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"
   },
@@ -17694,8 +17746,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-1048",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1056",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17704,8 +17756,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17714,8 +17766,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-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17724,8 +17776,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-1514",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1532",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17734,8 +17786,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-1548",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17744,8 +17796,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-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17754,8 +17806,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-1628",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -17774,8 +17826,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-1761",
-   "self_type" : "type-1760",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17784,8 +17836,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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17794,8 +17846,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-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17804,8 +17856,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-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17814,8 +17866,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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2063",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17824,8 +17876,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-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 12,
    "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"
   },
@@ -17834,8 +17886,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-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17844,8 +17896,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-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2226",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17854,8 +17906,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-400",
-   "self_type" : "type-399",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17864,8 +17916,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-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17874,8 +17926,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-581",
-   "self_type" : "type-580",
+   "referenced_type" : "type-585",
+   "self_type" : "type-584",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17884,8 +17936,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-655",
-   "self_type" : "type-654",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17894,8 +17946,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-708",
-   "self_type" : "type-707",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17904,8 +17956,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-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-751",
+   "self_type" : "type-750",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -17914,8 +17966,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-816",
-   "self_type" : "type-815",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "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"
   },
@@ -17924,8 +17976,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-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -17934,8 +17986,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17944,8 +17996,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17954,8 +18006,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17964,8 +18016,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1497",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17974,8 +18026,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1734",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17984,8 +18036,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-694",
+   "self_type" : "type-693",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17994,8 +18046,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18004,8 +18056,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18014,8 +18066,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-627",
-   "self_type" : "type-626",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18024,8 +18076,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-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1759",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18034,8 +18086,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-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18044,8 +18096,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-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18054,8 +18106,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-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18064,8 +18116,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-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18074,8 +18126,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-2078",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18084,8 +18136,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-367",
-   "self_type" : "type-366",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18094,8 +18146,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-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18104,8 +18156,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-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18114,8 +18166,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-651",
-   "self_type" : "type-650",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18124,8 +18176,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18134,8 +18186,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-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18144,8 +18196,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-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18154,8 +18206,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-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18164,8 +18216,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-1881",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18226,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-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18184,8 +18236,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-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18194,8 +18246,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-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18204,8 +18256,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-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18214,8 +18266,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-489",
-   "self_type" : "type-488",
+   "referenced_type" : "type-497",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18224,8 +18276,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-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18234,8 +18286,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-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18244,8 +18296,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-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18254,8 +18306,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-800",
-   "self_type" : "type-799",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18264,8 +18316,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-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18274,8 +18326,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-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1375",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18284,8 +18336,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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1640",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18294,8 +18346,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-1056",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18304,8 +18356,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18314,8 +18366,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18324,8 +18376,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-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18334,8 +18386,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-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18344,8 +18396,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-1457",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18354,8 +18406,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-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,8 +18416,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-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18374,8 +18426,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-1580",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1573",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18384,8 +18436,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-1597",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18394,8 +18446,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-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18404,8 +18456,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-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18414,8 +18466,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-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18424,8 +18476,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-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18434,8 +18486,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-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18444,8 +18496,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-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18454,8 +18506,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-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18464,8 +18516,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-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18474,8 +18526,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-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18484,8 +18536,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-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2078",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18494,8 +18546,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18504,8 +18556,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-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18514,8 +18566,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-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
+   "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-221",
+   "self_type" : "type-220",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18534,8 +18596,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-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18544,8 +18606,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-267",
+   "self_type" : "type-266",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18554,8 +18616,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-451",
-   "self_type" : "type-450",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18564,8 +18626,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-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18574,8 +18636,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-601",
-   "self_type" : "type-600",
+   "referenced_type" : "type-607",
+   "self_type" : "type-606",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18584,8 +18646,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18594,8 +18656,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-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18604,8 +18666,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-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18614,8 +18676,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18624,18 +18686,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-871",
-   "self_type" : "type-870",
-   "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-992",
-   "self_type" : "type-991",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18644,8 +18696,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18655,7 +18707,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18665,7 +18717,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18674,8 +18726,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18683,8 +18735,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-418",
+   "referenced_type" : "type-22",
+   "self_type" : "type-399",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18692,8 +18744,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-884",
+   "referenced_type" : "type-21",
+   "self_type" : "type-895",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -18707,14 +18759,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-877"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
+   "referenced_type" : "type-876",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -18726,17 +18778,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-753"
+     "referenced_type" : "type-762"
     }
    ],
    "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-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-493", "type-768" ],
+   "template_args" : [ "type-489", "type-777" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -18746,17 +18798,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-441"
+     "referenced_type" : "type-436"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -18766,17 +18818,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-727"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-726",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-730" ],
+   "template_args" : [ "type-728" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -18786,14 +18838,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-866"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-865",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -18805,14 +18857,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-874"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-873",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -18822,7 +18874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-435"
     }
    ],
    "fields" :
@@ -18831,20 +18883,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -18856,14 +18908,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -18875,14 +18927,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -18894,14 +18946,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-893",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -18914,14 +18966,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -18961,8 +19013,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -18972,8 +19024,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -18983,8 +19035,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -19016,8 +19068,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -19028,17 +19080,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-761"
     }
    ],
    "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-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-754" ],
+   "template_args" : [ "type-763" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -19085,14 +19137,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -19150,14 +19202,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -19169,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -19187,7 +19239,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -19196,25 +19248,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-865"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-876"
     },
     {
      "access" : "private",
@@ -19226,19 +19278,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-895"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-945"
     },
     {
      "access" : "private",
@@ -19250,8 +19302,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-937",
-   "self_type" : "type-937",
+   "referenced_type" : "type-947",
+   "self_type" : "type-947",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -19341,17 +19393,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -19396,17 +19448,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-271" ],
+   "template_args" : [ "type-281" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -19451,17 +19503,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-770",
+   "self_type" : "type-770",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-639" ],
+   "template_args" : [ "type-634" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -19506,17 +19558,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-745"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-769" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -19563,7 +19615,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "access" : "private",
@@ -19575,20 +19627,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -19640,14 +19692,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-726"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-728",
+   "self_type" : "type-728",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -19677,23 +19729,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-416"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-410"
+     "referenced_type" : "type-417"
     }
    ],
    "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-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-404" ],
+   "template_args" : [ "type-292", "type-413" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -19703,23 +19755,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-422"
     }
    ],
    "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-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-282", "type-16" ],
+   "template_args" : [ "type-292", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -19729,23 +19781,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-634"
+     "referenced_type" : "type-629"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-630"
     }
    ],
    "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-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-636", "type-638" ],
+   "template_args" : [ "type-631", "type-633" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19755,23 +19807,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19781,23 +19833,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19838,18 +19890,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-310"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19931,14 +19983,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-971"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -19950,13 +20002,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -19973,11 +20025,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19985,7 +20037,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -19994,17 +20046,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -20012,7 +20064,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20021,17 +20073,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -20039,7 +20091,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20048,17 +20100,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -20066,7 +20118,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20075,17 +20127,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -20093,7 +20145,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20102,17 +20154,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-560",
+   "self_type" : "type-560",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -20120,7 +20172,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20129,17 +20181,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-639",
+   "self_type" : "type-639",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -20147,7 +20199,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20156,17 +20208,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -20174,7 +20226,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -20183,17 +20235,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20201,17 +20253,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20250,34 +20302,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1097",
+   "self_type" : "type-1097",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-415" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1100",
+   "self_type" : "type-1100",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-420" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-713",
+   "self_type" : "type-713",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-628" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-1060",
+   "self_type" : "type-1060",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-714"
+    }
+   ],
+   "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-721",
+   "self_type" : "type-721",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20316,8 +20468,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20329,14 +20481,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20345,8 +20497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-891",
-   "self_type" : "type-891",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20355,8 +20507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20365,8 +20517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
+   "referenced_type" : "type-920",
+   "self_type" : "type-920",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20402,7 +20554,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -20413,8 +20565,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -20443,16 +20595,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-368"
     }
    ],
    "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-360",
-   "self_type" : "type-360",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20461,16 +20613,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-360"
     }
    ],
    "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-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -20479,16 +20631,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -20497,16 +20649,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20516,7 +20668,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20527,8 +20679,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20539,16 +20691,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20558,7 +20710,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -20569,8 +20721,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -20581,16 +20733,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20600,7 +20752,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -20611,8 +20763,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20624,7 +20776,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-369"
     },
     {
      "field_name" : "_pad",
@@ -20635,8 +20787,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20648,7 +20800,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "_pad",
@@ -20659,8 +20811,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20671,13 +20823,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -20690,7 +20842,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -20701,8 +20853,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20713,13 +20865,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -20732,7 +20884,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -20743,8 +20895,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20753,8 +20905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -20772,14 +20924,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -20788,11 +20940,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-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -20802,16 +20954,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -20819,7 +20971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-293"
     }
    ],
    "fields" :
@@ -20828,7 +20980,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
@@ -20840,13 +20992,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 192,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-292"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -20926,13 +21078,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -21014,19 +21166,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -21038,7 +21190,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -21050,13 +21202,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-310",
+   "self_type" : "type-310",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -21068,7 +21220,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -21080,13 +21232,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -21110,13 +21262,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -21129,7 +21281,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
@@ -21141,16 +21293,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-363" ],
+   "template_args" : [ "type-370" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -21160,7 +21312,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -21172,16 +21324,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -21191,7 +21343,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -21203,16 +21355,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -21222,7 +21374,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -21234,16 +21386,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -21251,7 +21403,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1040"
     }
    ],
    "fields" :
@@ -21259,14 +21411,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-1027"
+     "referenced_type" : "type-1037"
     }
    ],
    "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-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -21278,7 +21430,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -21290,13 +21442,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -21309,19 +21461,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -21331,10 +21483,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21343,13 +21495,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -21471,10 +21623,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-309"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21483,19 +21635,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-299",
-   "self_type" : "type-299",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "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",
@@ -21678,10 +21830,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21690,19 +21842,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-784"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "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",
@@ -21838,13 +21990,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "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"
@@ -21855,13 +22007,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -21970,7 +22122,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21979,13 +22131,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -22107,7 +22259,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -22116,13 +22268,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -22244,10 +22396,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22256,19 +22408,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -22475,10 +22627,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22487,19 +22639,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -22685,10 +22837,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22697,19 +22849,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "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",
@@ -22858,10 +23010,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22870,19 +23022,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-464",
+   "self_type" : "type-464",
    "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",
@@ -23010,13 +23162,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -23158,12 +23310,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -23173,18 +23325,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -23194,13 +23346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -23313,7 +23465,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -23322,13 +23474,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -23450,10 +23602,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23462,19 +23614,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -23684,10 +23836,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -23696,19 +23848,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "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",
@@ -23860,13 +24012,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -24011,7 +24163,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24020,13 +24172,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -24148,7 +24300,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -24157,13 +24309,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -24285,10 +24437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24297,19 +24449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -24495,10 +24647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24507,19 +24659,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -24744,10 +24896,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24756,19 +24908,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "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",
@@ -24896,10 +25048,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -24908,19 +25060,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "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",
@@ -25087,13 +25239,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -25206,13 +25358,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -25379,17 +25531,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-937" ],
+   "template_args" : [ "type-947" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -25399,17 +25551,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-906" ],
+   "template_args" : [ "type-916" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -25419,17 +25571,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-304" ],
+   "template_args" : [ "type-312" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -25439,17 +25591,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-778"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-780" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -25459,17 +25611,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-319" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -25479,17 +25631,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -25499,17 +25651,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-938"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-937",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-940" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -25519,17 +25671,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1012" ],
+   "template_args" : [ "type-1022" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -25539,157 +25691,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-277"
-    }
-   ],
-   "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-276",
-   "self_type" : "type-276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-896",
-   "self_type" : "type-896",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-287"
+    }
+   ],
+   "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-286",
+   "self_type" : "type-286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-288" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-290"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-906",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-291" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -25699,69 +25851,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-967",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25771,52 +25923,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1118",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1026",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1062",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25826,8 +25978,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25837,85 +25989,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1036",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-933",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1127",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -25925,52 +26077,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1009",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-978",
+   "self_type" : "type-978",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -25980,8 +26132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1120",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -25991,85 +26143,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-952",
+   "self_type" : "type-952",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26079,52 +26231,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1114",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-990",
+   "self_type" : "type-990",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26134,8 +26286,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1121",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26145,107 +26297,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1091",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1032",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-493" ],
+   "template_args" : [ "type-489" ],
    "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-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-469" ],
+   "template_args" : [ "type-472" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -26255,52 +26407,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1119",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1086",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1077" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1027",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -26310,8 +26462,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1123",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -26321,33 +26473,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1078" ],
+   "template_args" : [ "type-1090" ],
    "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-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -26357,23 +26509,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-639"
+     "referenced_type" : "type-634"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-633",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-641" ],
+   "template_args" : [ "type-636" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -26383,23 +26535,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-273" ],
+   "template_args" : [ "type-283" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -26409,23 +26561,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -26435,23 +26587,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-281"
     }
    ],
    "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-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -26460,18 +26612,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-858",
+   "self_type" : "type-858",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -26487,18 +26639,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -26509,7 +26661,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-842"
     },
     {
      "field_name" : "num_planes",
@@ -26519,13 +26671,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-835"
+     "referenced_type" : "type-846"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-845",
+   "self_type" : "type-845",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -26536,12 +26688,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-832"
+     "referenced_type" : "type-841"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-824"
+     "referenced_type" : "type-837"
     },
     {
      "field_name" : "bits_per_component",
@@ -26576,8 +26728,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -26588,38 +26740,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-856"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-857",
+   "self_type" : "type-857",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -26630,18 +26782,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -26652,17 +26804,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-746"
     },
     {
      "field_name" : "ystride",
@@ -26682,13 +26834,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-826"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -26698,13 +26850,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -26715,35 +26867,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-554"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-553"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     }
    ],
    "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-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "self_type" : "type-558",
    "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)"
@@ -26764,8 +26916,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -26776,12 +26928,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26806,13 +26958,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -26823,12 +26975,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26858,13 +27010,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-553",
+   "self_type" : "type-553",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -26875,12 +27027,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26910,13 +27062,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-554",
+   "self_type" : "type-554",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -26927,12 +27079,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -26967,13 +27119,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-556",
+   "self_type" : "type-556",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -27017,8 +27169,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27026,8 +27178,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27035,8 +27187,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-329",
-   "self_type" : "type-332",
+   "referenced_type" : "type-337",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27044,8 +27196,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-470",
-   "self_type" : "type-472",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27053,8 +27205,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-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-560",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27062,8 +27214,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-625",
-   "self_type" : "type-629",
+   "referenced_type" : "type-639",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27071,8 +27223,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-709",
-   "self_type" : "type-712",
+   "referenced_type" : "type-717",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27080,8 +27232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-340",
+   "referenced_type" : "type-151",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27089,8 +27241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-688",
+   "referenced_type" : "type-19",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27099,7 +27251,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-1098",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27107,8 +27259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-413",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27116,8 +27268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-506",
+   "referenced_type" : "type-20",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27125,8 +27277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-284",
-   "self_type" : "type-327",
+   "referenced_type" : "type-273",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27134,8 +27286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-318",
-   "self_type" : "type-339",
+   "referenced_type" : "type-310",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27143,8 +27295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27152,8 +27304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-905",
-   "self_type" : "type-920",
+   "referenced_type" : "type-915",
+   "self_type" : "type-929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27161,8 +27313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-768",
-   "self_type" : "type-918",
+   "referenced_type" : "type-777",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27170,8 +27322,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-276",
-   "self_type" : "type-324",
+   "referenced_type" : "type-286",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27179,8 +27331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-910",
+   "referenced_type" : "type-906",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27188,8 +27340,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-85",
-   "self_type" : "type-994",
+   "referenced_type" : "type-94",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27197,8 +27349,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-181",
-   "self_type" : "type-316",
+   "referenced_type" : "type-188",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27206,8 +27358,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-61",
-   "self_type" : "type-321",
+   "referenced_type" : "type-68",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27215,8 +27367,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27224,8 +27376,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-70",
-   "self_type" : "type-621",
+   "referenced_type" : "type-75",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27233,8 +27385,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27242,8 +27394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-638",
-   "self_type" : "type-673",
+   "referenced_type" : "type-633",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27251,8 +27403,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-282",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-292",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27260,215 +27412,116 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-636",
-   "self_type" : "type-670",
-   "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-1771",
-   "self_type" : "type-1770",
-   "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-1832",
-   "self_type" : "type-1831",
-   "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-1893",
-   "self_type" : "type-1892",
-   "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-1965",
-   "self_type" : "type-1964",
-   "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-2047",
-   "self_type" : "type-2046",
-   "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-2094",
-   "self_type" : "type-2093",
-   "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-420",
-   "self_type" : "type-419",
-   "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-503",
-   "self_type" : "type-502",
-   "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-585",
-   "self_type" : "type-584",
-   "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-662",
-   "self_type" : "type-661",
-   "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-747",
-   "self_type" : "type-746",
-   "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-826",
-   "self_type" : "type-825",
-   "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-1776",
-   "self_type" : "type-1775",
-   "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-1836",
-   "self_type" : "type-1835",
-   "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-1897",
-   "self_type" : "type-1896",
-   "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-1969",
-   "self_type" : "type-1968",
-   "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-2051",
-   "self_type" : "type-2050",
-   "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-2098",
-   "self_type" : "type-2097",
-   "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-425",
-   "self_type" : "type-424",
-   "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-509",
-   "self_type" : "type-508",
-   "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-589",
-   "self_type" : "type-588",
-   "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-666",
+   "referenced_type" : "type-631",
    "self_type" : "type-665",
    "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-751",
-   "self_type" : "type-750",
+   "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-1791",
+   "self_type" : "type-1790",
+   "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-1852",
+   "self_type" : "type-1851",
+   "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-1913",
+   "self_type" : "type-1912",
+   "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-1985",
+   "self_type" : "type-1984",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-2114",
+   "self_type" : "type-2113",
+   "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-426",
+   "self_type" : "type-425",
+   "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-510",
+   "self_type" : "type-509",
+   "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-588",
+   "self_type" : "type-587",
+   "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-667",
+   "self_type" : "type-666",
+   "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-754",
+   "self_type" : "type-753",
+   "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-834",
+   "self_type" : "type-833",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27476,8 +27529,107 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
+   "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-1856",
+   "self_type" : "type-1855",
+   "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-1917",
+   "self_type" : "type-1916",
+   "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-1989",
+   "self_type" : "type-1988",
+   "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-2071",
+   "self_type" : "type-2070",
+   "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-2118",
+   "self_type" : "type-2117",
+   "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-430",
+   "self_type" : "type-429",
+   "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-515",
+   "self_type" : "type-514",
+   "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-592",
+   "self_type" : "type-591",
+   "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-672",
+   "self_type" : "type-671",
+   "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-759",
+   "self_type" : "type-758",
+   "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-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27485,8 +27637,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27494,8 +27646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27503,8 +27655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27512,8 +27664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27521,8 +27673,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2049",
-   "self_type" : "type-2048",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27530,8 +27682,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27539,8 +27691,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27548,8 +27700,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27557,8 +27709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27566,8 +27718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27575,8 +27727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -27584,8 +27736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/x86/source-based/libhidltransport.so.lsdump b/Q/64/x86/source-based/libhidltransport.so.lsdump
index 190a3b0..86475c0 100644
--- a/Q/64/x86/source-based/libhidltransport.so.lsdump
+++ b/Q/64/x86/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-338",
+   "referenced_type" : "type-146",
+   "self_type" : "type-343",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-410",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-455",
+   "referenced_type" : "type-25",
+   "self_type" : "type-466",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-983",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1004",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-345",
+   "referenced_type" : "type-103",
+   "self_type" : "type-350",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-447",
+   "self_type" : "type-458",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -69,8 +78,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -79,24 +88,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -150,8 +159,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -170,8 +179,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 4
   },
   {
@@ -190,15 +199,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1788,10 +1797,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1800,10 +1805,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1840,10 +1841,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1856,14 +1853,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2651,8 +2640,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2669,8 +2658,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2687,8 +2676,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2713,8 +2702,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2743,8 +2732,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2765,8 +2754,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2819,8 +2808,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2862,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2899,8 +2888,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2917,8 +2906,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/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-2",
@@ -2943,11 +2932,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -2993,8 +2982,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3047,8 +3036,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3073,8 +3062,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3115,8 +3104,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3357,8 +3346,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3387,8 +3376,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3417,8 +3406,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3459,8 +3448,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3497,8 +3486,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3523,8 +3512,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3541,8 +3530,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3571,8 +3560,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3665,8 +3654,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-443",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3707,8 +3696,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3725,8 +3714,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3755,8 +3744,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3789,8 +3778,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3843,8 +3832,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3860,12 +3849,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     }
    ],
-   "referenced_type" : "type-459",
+   "referenced_type" : "type-470",
    "return_type" : "type-2",
-   "self_type" : "type-459",
+   "self_type" : "type-470",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3878,10 +3867,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3891,10 +3880,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3904,16 +3893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3923,13 +3912,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1614"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3939,13 +3928,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1615"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3955,13 +3944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3971,13 +3960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1616"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3987,13 +3976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1617"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4003,10 +3992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4016,10 +4005,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4029,10 +4018,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4042,16 +4031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4060,14 +4049,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4078,13 +4067,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1620"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4094,13 +4083,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4110,13 +4099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4125,16 +4114,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1623"
     }
    ],
    "return_type" : "type-2",
@@ -4147,16 +4136,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
      "default_arg" : true,
@@ -4164,7 +4153,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1624"
     }
    ],
    "return_type" : "type-2",
@@ -4176,16 +4165,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1625"
     }
    ],
    "return_type" : "type-2",
@@ -4199,13 +4188,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1626"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4214,16 +4203,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1627"
     }
    ],
    "return_type" : "type-2",
@@ -4235,16 +4224,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1628"
     }
    ],
    "return_type" : "type-2",
@@ -4256,16 +4245,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1629"
     }
    ],
    "return_type" : "type-2",
@@ -4277,16 +4266,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1630"
     }
    ],
    "return_type" : "type-2",
@@ -4298,16 +4287,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1631"
     }
    ],
    "return_type" : "type-2",
@@ -4321,10 +4310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4334,13 +4323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4350,19 +4339,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4372,13 +4361,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4388,19 +4377,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4410,10 +4399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4423,10 +4412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4436,10 +4425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4448,13 +4437,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4463,19 +4452,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4485,16 +4474,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4504,13 +4493,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1632"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4520,13 +4509,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1633"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4536,13 +4525,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4552,13 +4541,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1634"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4567,16 +4556,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1635"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4585,16 +4574,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1636"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4604,13 +4593,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1637"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4619,16 +4608,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1638"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4638,10 +4627,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,10 +4640,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4663,16 +4652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1639"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4681,13 +4670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4696,13 +4685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4712,10 +4701,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4725,16 +4714,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4744,13 +4733,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4760,13 +4749,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4776,14 +4765,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4793,16 +4782,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4812,13 +4801,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1640"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4828,13 +4817,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4844,14 +4833,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4861,13 +4850,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4877,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4893,11 +4882,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     }
    ],
    "return_type" : "type-2",
@@ -4910,13 +4899,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4926,10 +4915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4939,10 +4928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4951,13 +4940,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4967,10 +4956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4980,16 +4969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4998,14 +4987,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5014,14 +5003,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5032,13 +5021,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1646"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5048,13 +5037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5064,13 +5053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5079,16 +5068,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1652"
     }
    ],
    "return_type" : "type-2",
@@ -5101,16 +5090,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "default_arg" : true,
@@ -5118,7 +5107,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1653"
     }
    ],
    "return_type" : "type-2",
@@ -5132,13 +5121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5147,16 +5136,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1655"
     }
    ],
    "return_type" : "type-2",
@@ -5168,16 +5157,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1656"
     }
    ],
    "return_type" : "type-2",
@@ -5189,16 +5178,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1657"
     }
    ],
    "return_type" : "type-2",
@@ -5210,16 +5199,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1635"
+     "referenced_type" : "type-1658"
     }
    ],
    "return_type" : "type-2",
@@ -5231,16 +5220,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-1659"
     }
    ],
    "return_type" : "type-2",
@@ -5254,10 +5243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5266,16 +5255,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1637"
+     "referenced_type" : "type-1660"
     }
    ],
    "return_type" : "type-2",
@@ -5287,16 +5276,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1661"
     }
    ],
    "return_type" : "type-2",
@@ -5309,13 +5298,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5325,13 +5314,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5341,10 +5330,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5354,10 +5343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5367,10 +5356,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5379,16 +5368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1639"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5398,16 +5387,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5417,13 +5406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5433,13 +5422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5449,16 +5438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5468,13 +5457,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5484,13 +5473,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,16 +5488,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5518,16 +5507,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5536,19 +5525,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5558,13 +5547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5573,19 +5562,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5595,10 +5584,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5608,10 +5597,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5621,19 +5610,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5643,16 +5632,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,22 +5650,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5685,19 +5674,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5707,16 +5696,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5726,16 +5715,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5745,13 +5734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5761,10 +5750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5774,16 +5763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5792,19 +5781,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5813,19 +5802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5835,13 +5824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5851,13 +5840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5867,13 +5856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5883,14 +5872,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5900,16 +5889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5919,13 +5908,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5935,13 +5924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5951,14 +5940,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5968,13 +5957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5984,13 +5973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1651"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6000,11 +5989,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     }
    ],
    "return_type" : "type-2",
@@ -6017,13 +6006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6033,10 +6022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6046,10 +6035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6058,13 +6047,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6074,10 +6063,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6087,16 +6076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6105,14 +6094,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6121,14 +6110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6139,13 +6128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6155,13 +6144,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6171,13 +6160,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6186,10 +6175,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "referenced_type" : "type-11"
@@ -6207,10 +6196,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
      "referenced_type" : "type-11"
@@ -6229,16 +6218,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
      "default_arg" : true,
@@ -6246,7 +6235,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1681"
     }
    ],
    "return_type" : "type-2",
@@ -6260,13 +6249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6275,16 +6264,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1683"
     }
    ],
    "return_type" : "type-2",
@@ -6298,10 +6287,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6311,13 +6300,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6327,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6343,10 +6332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6356,10 +6345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6369,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6382,16 +6371,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6401,13 +6390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6417,13 +6406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6433,13 +6422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6449,13 +6438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6465,19 +6454,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6487,13 +6476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6502,22 +6491,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6527,10 +6516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6540,10 +6529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,10 +6542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6566,16 +6555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6585,13 +6574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6601,13 +6590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6617,14 +6606,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6634,16 +6623,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6653,13 +6642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6669,13 +6658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6685,14 +6674,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6702,13 +6691,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6718,13 +6707,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6734,11 +6723,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     }
    ],
    "return_type" : "type-2",
@@ -6751,13 +6740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6767,10 +6756,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6780,10 +6769,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6792,13 +6781,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6808,10 +6797,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6821,16 +6810,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6839,14 +6828,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6855,14 +6844,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6871,14 +6860,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6889,13 +6878,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,13 +6894,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6921,13 +6910,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6937,16 +6926,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
      "default_arg" : true,
@@ -6954,7 +6943,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1700"
     }
    ],
    "return_type" : "type-2",
@@ -6968,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6983,16 +6972,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1702"
     }
    ],
    "return_type" : "type-2",
@@ -7006,10 +6995,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7019,13 +7008,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7035,13 +7024,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7051,10 +7040,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7064,10 +7053,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7077,10 +7066,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7090,16 +7079,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7109,13 +7098,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7125,13 +7114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7141,16 +7130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7160,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7176,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7192,16 +7181,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7211,13 +7200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7227,10 +7216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7240,10 +7229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7253,19 +7242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7275,16 +7264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7294,19 +7283,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7315,22 +7304,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1158"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7340,16 +7329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7359,16 +7348,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7378,13 +7367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7394,10 +7383,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7407,16 +7396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7426,13 +7415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1709"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7442,13 +7431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7458,13 +7447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7474,14 +7463,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7491,16 +7480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7510,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1710"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7526,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1711"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7542,14 +7531,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7559,13 +7548,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7575,13 +7564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7591,11 +7580,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     }
    ],
    "return_type" : "type-2",
@@ -7608,13 +7597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1713"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7624,10 +7613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7637,10 +7626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7649,13 +7638,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7665,10 +7654,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7678,16 +7667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7696,14 +7685,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7712,14 +7701,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7729,14 +7718,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7746,16 +7735,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7765,13 +7754,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1714"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7781,13 +7770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1715"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7797,14 +7786,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7814,13 +7803,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7830,13 +7819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7846,11 +7835,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     }
    ],
    "return_type" : "type-2",
@@ -7863,13 +7852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1694"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7879,10 +7868,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7892,10 +7881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7904,13 +7893,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7920,10 +7909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7933,16 +7922,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7951,14 +7940,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7967,14 +7956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7983,14 +7972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7999,14 +7988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -8017,13 +8006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1697"
+     "referenced_type" : "type-1720"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8033,13 +8022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8049,13 +8038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8066,13 +8055,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-1725"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8082,13 +8071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8098,13 +8087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8114,16 +8103,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
      "default_arg" : true,
@@ -8131,7 +8120,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1732"
     }
    ],
    "return_type" : "type-2",
@@ -8145,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8160,16 +8149,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-1734"
     }
    ],
    "return_type" : "type-2",
@@ -8183,10 +8172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8196,13 +8185,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8212,13 +8201,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8228,10 +8217,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8241,10 +8230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8254,10 +8243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8267,16 +8256,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
      "default_arg" : true,
@@ -8284,7 +8273,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-1735"
     }
    ],
    "return_type" : "type-2",
@@ -8298,13 +8287,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8313,16 +8302,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1714"
+     "referenced_type" : "type-1737"
     }
    ],
    "return_type" : "type-2",
@@ -8334,16 +8323,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1715"
+     "referenced_type" : "type-1738"
     }
    ],
    "return_type" : "type-2",
@@ -8355,16 +8344,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1716"
+     "referenced_type" : "type-1739"
     }
    ],
    "return_type" : "type-2",
@@ -8376,16 +8365,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1717"
+     "referenced_type" : "type-1740"
     }
    ],
    "return_type" : "type-2",
@@ -8397,16 +8386,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1718"
+     "referenced_type" : "type-1741"
     }
    ],
    "return_type" : "type-2",
@@ -8420,10 +8409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8433,13 +8422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8449,13 +8438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8465,10 +8454,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8478,10 +8467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8491,10 +8480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8504,16 +8493,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8523,13 +8512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8539,13 +8528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8555,13 +8544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8571,13 +8560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1721"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8586,19 +8575,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8608,13 +8597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1722"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8624,10 +8613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8637,10 +8626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8650,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8663,16 +8652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8682,16 +8671,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8701,13 +8690,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8717,13 +8706,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8733,16 +8722,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8752,19 +8741,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8774,13 +8763,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1723"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8790,13 +8779,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1747"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8806,16 +8795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8825,19 +8814,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8847,13 +8836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8863,13 +8852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1725"
+     "referenced_type" : "type-1748"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8879,16 +8868,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1726"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8897,22 +8886,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8921,22 +8910,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8946,13 +8935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8962,10 +8951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8975,10 +8964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8988,22 +8977,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9013,16 +9002,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-1751"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9032,19 +9021,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9054,16 +9043,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9073,16 +9062,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9092,19 +9081,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9113,25 +9102,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9140,19 +9129,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9161,19 +9150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9183,16 +9172,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9202,16 +9191,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9221,13 +9210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9237,10 +9226,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9250,16 +9239,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9269,13 +9258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1731"
+     "referenced_type" : "type-1754"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9285,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9301,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9316,12 +9305,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-406", "type-153" ]
+   "template_args" : [ "type-31", "type-420", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9329,12 +9318,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9342,12 +9331,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9355,12 +9344,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9368,10 +9357,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-375"
     }
    ],
    "return_type" : "type-2",
@@ -9383,10 +9372,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-561"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     }
    ],
    "return_type" : "type-2",
@@ -9398,10 +9387,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
    "return_type" : "type-2",
@@ -9413,10 +9402,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-291",
+   "return_type" : "type-296",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9425,13 +9414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9446,19 +9435,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9467,10 +9456,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-377"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9498,14 +9487,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-576"
     }
    ],
    "return_type" : "type-2",
@@ -9518,10 +9507,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9531,16 +9520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9549,7 +9538,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "referenced_type" : "type-2"
@@ -9558,7 +9547,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9573,10 +9562,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9594,10 +9583,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9615,10 +9604,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9639,10 +9628,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9651,10 +9640,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9672,10 +9661,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9693,10 +9682,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9714,28 +9703,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-428",
+   "return_type" : "type-439",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9745,13 +9734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-369"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9761,10 +9750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
-   "return_type" : "type-354",
+   "return_type" : "type-359",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9774,19 +9763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9796,19 +9785,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9820,22 +9809,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9844,18 +9833,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9863,18 +9852,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9882,18 +9871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9901,18 +9890,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9920,18 +9909,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9939,18 +9928,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9958,18 +9947,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9977,18 +9966,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -9996,10 +9985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-749",
+   "return_type" : "type-764",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10008,12 +9997,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10021,12 +10010,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10034,12 +10023,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10047,17 +10036,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10072,13 +10061,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10087,18 +10076,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10106,18 +10095,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10125,18 +10114,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10144,18 +10133,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10163,29 +10152,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10194,19 +10183,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10215,10 +10204,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10227,10 +10216,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10239,10 +10228,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10254,79 +10243,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-764",
+   "referenced_type" : "type-779",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-765",
+   "referenced_type" : "type-780",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-374",
+   "referenced_type" : "type-409",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10336,8 +10325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-466",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10345,8 +10334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-476",
+   "referenced_type" : "type-483",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10354,8 +10343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-329",
+   "referenced_type" : "type-325",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10363,17 +10352,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-317",
+   "referenced_type" : "type-317",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-697",
+   "self_type" : "type-709",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-703",
+   "self_type" : "type-712",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10381,8 +10388,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10390,8 +10397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10399,8 +10406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10408,8 +10415,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10417,8 +10424,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10426,8 +10433,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-954",
-   "self_type" : "type-958",
+   "referenced_type" : "type-977",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10435,8 +10442,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-1073",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10444,8 +10451,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-1144",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10453,8 +10460,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-1213",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10462,8 +10469,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-1291",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10471,8 +10478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-294",
+   "referenced_type" : "type-151",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10480,8 +10487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-400",
+   "referenced_type" : "type-19",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10498,8 +10505,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-979",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10507,8 +10514,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-626",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10516,8 +10523,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10525,8 +10532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10534,8 +10541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10543,8 +10550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-281",
+   "referenced_type" : "type-281",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10552,8 +10559,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10561,8 +10568,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-978",
-   "self_type" : "type-988",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10570,8 +10577,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-625",
-   "self_type" : "type-977",
+   "referenced_type" : "type-636",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10579,8 +10586,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-632",
-   "self_type" : "type-636",
+   "referenced_type" : "type-644",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10588,8 +10595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10597,8 +10604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10606,8 +10613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-518",
+   "referenced_type" : "type-439",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10615,8 +10622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10624,8 +10631,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-917",
-   "self_type" : "type-950",
+   "referenced_type" : "type-937",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10633,8 +10640,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-85",
-   "self_type" : "type-661",
+   "referenced_type" : "type-94",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10642,8 +10649,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-181",
-   "self_type" : "type-943",
+   "referenced_type" : "type-188",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10651,8 +10658,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-61",
-   "self_type" : "type-945",
+   "referenced_type" : "type-68",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10660,8 +10667,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10669,8 +10676,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-70",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10678,8 +10685,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10687,8 +10694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-379",
-   "self_type" : "type-501",
+   "referenced_type" : "type-384",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10696,8 +10703,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-359",
-   "self_type" : "type-485",
+   "referenced_type" : "type-364",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10705,8 +10712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
+   "referenced_type" : "type-331",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10714,8 +10721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-316",
+   "referenced_type" : "type-319",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10723,8 +10730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10732,8 +10739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1137",
    "size" : 4,
    "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"
   },
@@ -10741,8 +10748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1204",
    "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"
   },
@@ -10750,8 +10757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10759,8 +10766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1281",
    "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"
   },
@@ -10768,8 +10775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10777,8 +10784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "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"
   },
@@ -10786,8 +10793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10795,8 +10802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-961",
+   "referenced_type" : "type-552",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10804,8 +10811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10813,8 +10820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-551",
+   "referenced_type" : "type-90",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10822,8 +10829,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10831,8 +10838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10840,8 +10847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-298",
-   "self_type" : "type-299",
+   "referenced_type" : "type-303",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10849,8 +10856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-279",
-   "self_type" : "type-280",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10858,8 +10865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-279",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10867,8 +10874,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-1363",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10876,8 +10883,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-630",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-642",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10885,8 +10892,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-992",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10894,8 +10901,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-637",
-   "self_type" : "type-639",
+   "referenced_type" : "type-648",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10903,8 +10910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-554",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10912,8 +10919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10921,8 +10928,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-392",
-   "self_type" : "type-393",
+   "referenced_type" : "type-397",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10930,8 +10937,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-991",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10939,8 +10946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-519",
-   "self_type" : "type-706",
+   "referenced_type" : "type-530",
+   "self_type" : "type-728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10948,8 +10955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10957,8 +10964,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-916",
-   "self_type" : "type-919",
+   "referenced_type" : "type-936",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10966,8 +10973,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-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10975,8 +10982,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-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10984,8 +10991,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10993,8 +11000,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11002,8 +11009,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11011,8 +11018,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11020,8 +11027,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11029,8 +11036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-499",
-   "self_type" : "type-500",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11038,8 +11045,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11047,8 +11054,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-362",
-   "self_type" : "type-364",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11056,8 +11063,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-490",
-   "self_type" : "type-491",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11065,8 +11072,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-486",
-   "self_type" : "type-702",
+   "referenced_type" : "type-497",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11074,8 +11081,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11083,8 +11090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11092,8 +11099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11101,79 +11108,72 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1087",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1108",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1179",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1247",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1490",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1529",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1551",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11186,79 +11186,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-547",
-   "self_type" : "type-549",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-621",
-   "self_type" : "type-624",
+   "referenced_type" : "type-558",
+   "self_type" : "type-560",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-672",
-   "self_type" : "type-674",
+   "referenced_type" : "type-633",
+   "self_type" : "type-635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-813",
-   "self_type" : "type-816",
+   "referenced_type" : "type-739",
+   "self_type" : "type-741",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-835",
+   "self_type" : "type-837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-987",
+   "referenced_type" : "type-909",
+   "self_type" : "type-911",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-973",
+   "referenced_type" : "type-986",
+   "self_type" : "type-991",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-992",
+   "self_type" : "type-994",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-351",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11266,8 +11273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11275,8 +11282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11284,8 +11291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11293,8 +11300,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-1015",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11302,8 +11309,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-1098",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1120",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11311,8 +11318,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-1168",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11320,8 +11327,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-1236",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11329,8 +11336,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-1289",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11338,8 +11345,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-1319",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11347,8 +11354,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1391",
    "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"
   },
@@ -11356,197 +11363,125 @@
    "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-1477",
-   "self_type" : "type-1479",
-   "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-1545",
-   "self_type" : "type-1547",
-   "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-155",
-   "self_type" : "type-157",
-   "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-401",
-   "self_type" : "type-403",
-   "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-562",
-   "self_type" : "type-564",
-   "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-650",
-   "self_type" : "type-652",
-   "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-833",
-   "self_type" : "type-835",
-   "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-1541",
-   "self_type" : "type-1540",
-   "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-645",
-   "self_type" : "type-644",
-   "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-1280",
-   "self_type" : "type-1279",
-   "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-396",
-   "self_type" : "type-395",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
-   "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
-   "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-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1055",
-   "self_type" : "type-1054",
-   "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-1123",
-   "self_type" : "type-1122",
-   "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-1188",
-   "self_type" : "type-1187",
-   "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-1241",
-   "self_type" : "type-1240",
-   "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-1264",
-   "self_type" : "type-1263",
-   "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-1336",
-   "self_type" : "type-1335",
-   "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-1390",
-   "self_type" : "type-1389",
-   "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-1409",
-   "self_type" : "type-1408",
-   "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-1499",
-   "self_type" : "type-1498",
+   "self_type" : "type-1501",
+   "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-1567",
+   "self_type" : "type-1569",
+   "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-162",
+   "self_type" : "type-164",
+   "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-406",
+   "self_type" : "type-408",
+   "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-573",
+   "self_type" : "type-576",
+   "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-661",
+   "self_type" : "type-663",
+   "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-855",
+   "self_type" : "type-857",
+   "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-1563",
+   "self_type" : "type-1562",
+   "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-657",
+   "self_type" : "type-656",
+   "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-1290",
+   "self_type" : "type-1289",
+   "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-401",
+   "self_type" : "type-400",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
+   "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-843",
+   "self_type" : "type-845",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1074",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11554,8 +11489,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-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11563,8 +11498,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-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11572,8 +11507,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-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11581,8 +11516,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11590,8 +11525,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11599,8 +11534,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-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11608,8 +11543,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-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11617,8 +11552,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-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1520",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11626,8 +11561,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-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11635,8 +11570,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-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11644,8 +11579,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-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11653,8 +11588,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
+   "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-266",
+   "self_type" : "type-265",
+   "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-390",
+   "self_type" : "type-389",
+   "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-601",
+   "self_type" : "type-600",
+   "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-673",
+   "self_type" : "type-672",
+   "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-721",
+   "self_type" : "type-720",
+   "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-785",
+   "self_type" : "type-784",
+   "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-890",
+   "self_type" : "type-889",
+   "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-924",
+   "self_type" : "type-923",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11662,8 +11669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11671,8 +11678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11680,8 +11687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11689,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11699,7 +11706,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-309",
+   "self_type" : "type-314",
    "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"
   },
@@ -11707,8 +11714,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-577",
+   "referenced_type" : "type-103",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -11719,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-471",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -11728,8 +11735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
+   "referenced_type" : "type-473",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11737,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-467",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11746,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-474",
+   "referenced_type" : "type-483",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11755,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-477",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11764,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11773,8 +11780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11782,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11791,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11800,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11809,8 +11816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11818,8 +11825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11827,8 +11834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11836,8 +11843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11845,8 +11852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11854,17 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11881,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11890,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11899,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11908,8 +11906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11917,8 +11915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11926,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11935,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-809",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11944,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11953,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11962,8 +11960,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11971,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11980,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11989,8 +11996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -11998,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-320",
-   "self_type" : "type-330",
+   "referenced_type" : "type-325",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12007,8 +12014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-312",
-   "self_type" : "type-318",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12016,8 +12023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12025,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-494",
+   "referenced_type" : "type-418",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -12034,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12043,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12052,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12061,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12070,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12079,8 +12086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12088,8 +12095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12097,8 +12104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "type-386",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12106,8 +12113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12115,8 +12122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-801",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12124,8 +12131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12133,8 +12140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12142,8 +12149,8 @@
    "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-682",
-   "self_type" : "type-685",
+   "referenced_type" : "type-697",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12151,8 +12158,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-688",
-   "self_type" : "type-692",
+   "referenced_type" : "type-703",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12160,8 +12167,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-374",
-   "self_type" : "type-387",
+   "referenced_type" : "type-379",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12169,8 +12176,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-245",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-252",
+   "self_type" : "type-666",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12178,8 +12185,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-239",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-246",
+   "self_type" : "type-414",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12196,8 +12203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12205,8 +12212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12214,8 +12221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12223,8 +12230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12232,8 +12239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12241,8 +12248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12250,8 +12257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12259,8 +12266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12268,8 +12275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12277,8 +12284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12286,8 +12293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12295,8 +12302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12304,8 +12311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12313,8 +12320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12322,8 +12329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12331,8 +12338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-705",
-   "self_type" : "type-704",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12340,8 +12347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12349,8 +12356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12358,8 +12365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12367,8 +12374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12376,8 +12383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12385,8 +12392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12394,8 +12401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12403,8 +12410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12412,8 +12419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12421,8 +12428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12430,8 +12437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12439,8 +12446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12448,8 +12455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12457,8 +12464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12466,8 +12473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12475,8 +12482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-561",
+   "referenced_type" : "type-570",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -12484,8 +12491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12493,8 +12500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 4,
    "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"
   },
@@ -12502,26 +12509,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
-   "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-1206",
    "self_type" : "type-1205",
    "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-1215",
+   "self_type" : "type-1214",
+   "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-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "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"
   },
@@ -12529,8 +12536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12538,8 +12545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "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"
   },
@@ -12547,8 +12554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12556,8 +12563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12565,8 +12572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12574,8 +12581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12583,8 +12590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12592,8 +12599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12601,8 +12608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12610,8 +12617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12619,8 +12626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12628,8 +12635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12637,8 +12644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12646,8 +12653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12655,8 +12662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12664,8 +12671,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12673,8 +12680,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12682,8 +12689,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-954",
-   "self_type" : "type-956",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12691,8 +12698,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-1073",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12700,8 +12707,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-1144",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12709,8 +12716,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-1213",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12718,8 +12725,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-1291",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12727,8 +12734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-273",
+   "referenced_type" : "type-151",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12736,8 +12743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-383",
+   "referenced_type" : "type-19",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12746,7 +12753,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-537",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12754,8 +12761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12763,17 +12770,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-708",
+   "self_type" : "type-710",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-711",
+   "self_type" : "type-713",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-409",
+   "self_type" : "type-411",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-665",
+   "self_type" : "type-667",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-413",
+   "self_type" : "type-415",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-405",
+   "referenced_type" : "type-56",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12781,375 +12833,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
-   "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-784",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-979",
-   "self_type" : "type-1049",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-626",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-131",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
-   "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-982",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
-   "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_string *",
-   "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-978",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-625",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-130",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-632",
-   "self_type" : "type-635",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<int> *",
-   "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
-   "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-333",
-   "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::hidl::base::V1_0::BpHwBase *",
-   "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
-   "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
-   "size" : 4,
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
-   "size" : 4,
-   "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::hidl::manager::V1_0::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1062",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
-   "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::hidl::manager::V1_1::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-1136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
-   "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
-   "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::hidl::manager::V1_2::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-1199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1198",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
-   "name" : "android::hidl::manager::V1_2::IClientCallback *",
    "referenced_type" : "type-72",
    "self_type" : "type-71",
    "size" : 4,
@@ -13157,10 +12840,379 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-1000",
+   "self_type" : "type-1067",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-637",
+   "self_type" : "type-1063",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-137",
+   "self_type" : "type-166",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
+   "name" : "android::hardware::details::hidl_pointer<int> *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-20",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_string *",
+   "name" : "android::hardware::hidl_string *",
+   "referenced_type" : "type-141",
+   "self_type" : "type-639",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-999",
+   "self_type" : "type-1005",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-636",
+   "self_type" : "type-995",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-136",
+   "self_type" : "type-150",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-644",
+   "self_type" : "type-646",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<int> *",
+   "name" : "android::hardware::hidl_vec<int> *",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
+   "name" : "android::hidl::base::V1_0::BnHwBase *",
+   "referenced_type" : "type-160",
+   "self_type" : "type-338",
+   "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::hidl::base::V1_0::BpHwBase *",
+   "name" : "android::hidl::base::V1_0::BpHwBase *",
+   "referenced_type" : "type-420",
+   "self_type" : "type-950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
+   "name" : "android::hidl::base::V1_0::BsBase *",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1366",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
+   "size" : 4,
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
+   "size" : 4,
+   "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::hidl::manager::V1_0::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
+   "referenced_type" : "type-192",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "referenced_type" : "type-181",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "referenced_type" : "type-944",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "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::hidl::manager::V1_1::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
+   "name" : "android::hidl::manager::V1_1::IServiceManager *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
+   "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::hidl::manager::V1_2::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "referenced_type" : "type-209",
+   "self_type" : "type-1222",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
+   "name" : "android::hidl::manager::V1_2::IClientCallback *",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13168,8 +13220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13177,8 +13229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-951",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13186,8 +13238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-514",
+   "referenced_type" : "type-439",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13195,8 +13247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13204,8 +13256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-529",
+   "referenced_type" : "type-536",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13213,8 +13265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13222,339 +13274,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-917",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-498",
-   "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-910",
-   "self_type" : "type-915",
-   "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-354",
-   "self_type" : "type-489",
-   "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-359",
-   "self_type" : "type-482",
-   "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-449",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-327",
-   "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-314",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1022",
-   "self_type" : "type-1023",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-390",
-   "self_type" : "type-391",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-647",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-398",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1452",
-   "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-521",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-959",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1077",
-   "self_type" : "type-1078",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1148",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1219",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1296",
-   "self_type" : "type-1297",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -13562,10 +13281,343 @@
   },
   {
    "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-937",
+   "self_type" : "type-970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-505",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-612",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-509",
+   "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-930",
+   "self_type" : "type-935",
+   "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-359",
+   "self_type" : "type-501",
+   "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-364",
+   "self_type" : "type-490",
+   "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-460",
+   "self_type" : "type-464",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-356",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-331",
+   "self_type" : "type-332",
+   "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-319",
+   "self_type" : "type-320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1044",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-395",
+   "self_type" : "type-396",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-659",
+   "self_type" : "type-660",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1474",
+   "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-533",
+   "self_type" : "type-535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-981",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1098",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1168",
+   "self_type" : "type-1169",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1237",
+   "self_type" : "type-1238",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1317",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-553",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-813",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13573,8 +13625,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-654",
-   "self_type" : "type-655",
+   "referenced_type" : "type-669",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13582,8 +13634,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13591,8 +13643,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-567",
+   "referenced_type" : "type-132",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13600,8 +13652,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13609,8 +13661,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-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13618,8 +13670,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-522",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13627,8 +13679,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-284",
+   "referenced_type" : "type-284",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13636,8 +13688,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-629",
+   "referenced_type" : "type-279",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13645,8 +13697,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-1363",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13654,8 +13706,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-630",
-   "self_type" : "type-631",
+   "referenced_type" : "type-642",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13663,8 +13715,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-992",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13672,8 +13724,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-637",
-   "self_type" : "type-638",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13681,8 +13733,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-553",
+   "referenced_type" : "type-563",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13690,8 +13742,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-293",
+   "referenced_type" : "type-297",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13699,8 +13751,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-414",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
    "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"
   },
@@ -13708,8 +13760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-383",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -13726,8 +13778,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -13735,8 +13787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13744,8 +13796,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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13753,8 +13805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-570",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "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"
   },
@@ -13762,8 +13814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -13771,8 +13823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "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"
   },
@@ -13780,8 +13832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -13789,8 +13841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -13798,8 +13850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "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"
   },
@@ -13807,8 +13859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "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"
   },
@@ -13816,15 +13868,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
-   "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-530",
    "self_type" : "type-531",
    "size" : 4,
@@ -13832,10 +13875,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
+   "name" : "const android::sp<android::hardware::ProcessState> *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-614",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13843,8 +13895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13852,8 +13904,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-916",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13861,8 +13913,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-492",
-   "self_type" : "type-509",
+   "referenced_type" : "type-504",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13870,8 +13922,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-483",
-   "self_type" : "type-513",
+   "referenced_type" : "type-494",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13879,8 +13931,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-223",
-   "self_type" : "type-597",
+   "referenced_type" : "type-230",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13888,8 +13940,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-60",
-   "self_type" : "type-604",
+   "referenced_type" : "type-67",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13897,8 +13949,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-30",
-   "self_type" : "type-599",
+   "referenced_type" : "type-37",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13906,8 +13958,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-69",
-   "self_type" : "type-608",
+   "referenced_type" : "type-74",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13915,8 +13967,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-41",
-   "self_type" : "type-602",
+   "referenced_type" : "type-48",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13924,8 +13976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-504",
+   "referenced_type" : "type-511",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13933,8 +13985,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13942,8 +13994,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-486",
-   "self_type" : "type-487",
+   "referenced_type" : "type-497",
+   "self_type" : "type-498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13951,8 +14003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13960,8 +14012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14021,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-989",
+   "referenced_type" : "type-158",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13978,8 +14030,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-348",
+   "referenced_type" : "type-351",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13987,8 +14039,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13996,8 +14048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-999",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14005,8 +14057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-301",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14014,8 +14066,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-460",
+   "referenced_type" : "type-470",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -14024,7 +14076,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14032,8 +14084,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-350",
+   "referenced_type" : "type-348",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14042,7 +14094,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14050,8 +14102,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-450",
+   "referenced_type" : "type-103",
+   "self_type" : "type-461",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -14060,7 +14112,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-1010",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14068,8 +14120,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-416",
+   "referenced_type" : "type-22",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14077,8 +14129,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-416",
-   "self_type" : "type-461",
+   "referenced_type" : "type-427",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -14090,8 +14142,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14100,8 +14152,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14110,8 +14162,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14120,8 +14172,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14130,8 +14182,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14140,8 +14192,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14150,8 +14202,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14160,8 +14212,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14170,18 +14222,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14200,8 +14242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14210,8 +14252,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14220,8 +14262,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14230,8 +14272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +14282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-669",
-   "self_type" : "type-671",
+   "referenced_type" : "type-629",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14250,8 +14292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
+   "referenced_type" : "type-683",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14260,8 +14302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-809",
-   "self_type" : "type-811",
+   "referenced_type" : "type-735",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-882",
-   "self_type" : "type-884",
+   "referenced_type" : "type-829",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14280,8 +14322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-903",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14290,8 +14332,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-966",
-   "self_type" : "type-968",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +14352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -14310,8 +14362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14320,8 +14372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-320",
-   "self_type" : "type-326",
+   "referenced_type" : "type-325",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14330,8 +14382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-312",
-   "self_type" : "type-314",
+   "referenced_type" : "type-317",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14340,8 +14392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-426",
+   "self_type" : "type-428",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14350,8 +14402,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-682",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-697",
+   "self_type" : "type-1044",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14360,8 +14412,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-688",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-703",
+   "self_type" : "type-1046",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14370,8 +14422,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-374",
-   "self_type" : "type-390",
+   "referenced_type" : "type-379",
+   "self_type" : "type-395",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14380,8 +14432,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-245",
-   "self_type" : "type-647",
+   "referenced_type" : "type-252",
+   "self_type" : "type-659",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14390,8 +14442,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<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-239",
-   "self_type" : "type-398",
+   "referenced_type" : "type-246",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14400,8 +14452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1472",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14420,8 +14472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14430,8 +14482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -14440,8 +14492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "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"
   },
@@ -14450,8 +14502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1211",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14460,8 +14512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "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"
   },
@@ -14470,8 +14522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14480,8 +14532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "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"
   },
@@ -14490,8 +14542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14500,8 +14552,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14510,8 +14562,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14520,8 +14572,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-954",
-   "self_type" : "type-959",
+   "referenced_type" : "type-977",
+   "self_type" : "type-981",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14530,8 +14582,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-1073",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1098",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14540,8 +14592,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-1144",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1168",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14550,8 +14602,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-1213",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14560,8 +14612,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-1291",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1317",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14570,8 +14622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-541",
+   "referenced_type" : "type-151",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14580,8 +14632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14591,7 +14643,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14600,8 +14652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1043",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14610,8 +14662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14620,8 +14672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14682,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-979",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14640,8 +14692,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-626",
-   "self_type" : "type-654",
+   "referenced_type" : "type-637",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14650,8 +14702,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14660,8 +14712,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14670,8 +14722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-332",
+   "referenced_type" : "type-20",
+   "self_type" : "type-337",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14680,8 +14732,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-982",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1384",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14690,8 +14742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-510",
+   "referenced_type" : "type-361",
+   "self_type" : "type-522",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14700,8 +14752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-298",
+   "referenced_type" : "type-273",
+   "self_type" : "type-303",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14710,8 +14762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-279",
+   "referenced_type" : "type-281",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14720,8 +14772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-274",
+   "referenced_type" : "type-141",
+   "self_type" : "type-279",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14730,8 +14782,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-978",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14740,8 +14792,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-636",
+   "self_type" : "type-642",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14750,8 +14802,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-130",
-   "self_type" : "type-992",
+   "referenced_type" : "type-136",
+   "self_type" : "type-1013",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14760,8 +14812,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-632",
-   "self_type" : "type-637",
+   "referenced_type" : "type-644",
+   "self_type" : "type-648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14770,8 +14822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-550",
+   "referenced_type" : "type-127",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14780,8 +14832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-292",
+   "referenced_type" : "type-295",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,8 +14842,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-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-420",
+   "self_type" : "type-424",
    "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"
   },
@@ -14800,8 +14852,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-141",
-   "self_type" : "type-308",
+   "referenced_type" : "type-147",
+   "self_type" : "type-313",
    "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"
   },
@@ -14810,8 +14862,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-24",
-   "self_type" : "type-378",
+   "referenced_type" : "type-31",
+   "self_type" : "type-383",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14820,8 +14872,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-377",
-   "self_type" : "type-392",
+   "referenced_type" : "type-382",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14830,8 +14882,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -14840,8 +14892,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -14850,8 +14902,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-23",
-   "self_type" : "type-574",
+   "referenced_type" : "type-30",
+   "self_type" : "type-585",
    "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"
   },
@@ -14860,8 +14912,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-134",
-   "self_type" : "type-991",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1012",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14870,8 +14922,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-573",
-   "self_type" : "type-578",
+   "referenced_type" : "type-584",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14880,8 +14932,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-96",
-   "self_type" : "type-576",
+   "referenced_type" : "type-102",
+   "self_type" : "type-587",
    "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"
   },
@@ -14890,8 +14942,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-63",
-   "self_type" : "type-568",
+   "referenced_type" : "type-70",
+   "self_type" : "type-580",
    "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"
   },
@@ -14900,8 +14952,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -14910,8 +14962,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-22",
-   "self_type" : "type-583",
+   "referenced_type" : "type-29",
+   "self_type" : "type-595",
    "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"
   },
@@ -14920,8 +14972,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -14930,8 +14982,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -14940,8 +14992,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-72",
-   "self_type" : "type-571",
+   "referenced_type" : "type-77",
+   "self_type" : "type-582",
    "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"
   },
@@ -14950,8 +15002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-586",
+   "referenced_type" : "type-51",
+   "self_type" : "type-597",
    "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"
   },
@@ -14960,8 +15012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-519",
+   "referenced_type" : "type-439",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14980,8 +15032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15042,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-609",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15000,8 +15052,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15010,8 +15062,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-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15020,8 +15072,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-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15030,8 +15082,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-85",
-   "self_type" : "type-483",
+   "referenced_type" : "type-94",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15040,8 +15092,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15050,8 +15102,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15060,8 +15112,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15070,8 +15122,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15132,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +15142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-499",
+   "referenced_type" : "type-384",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,16 +15151,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1200",
    "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-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -15116,8 +15168,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-354",
-   "self_type" : "type-490",
+   "referenced_type" : "type-359",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15126,8 +15178,8 @@
    "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-359",
-   "self_type" : "type-486",
+   "referenced_type" : "type-364",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15136,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15146,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15156,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15166,8 +15218,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15176,8 +15228,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15187,7 +15239,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15195,80 +15247,72 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1488",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1527",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1549",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15283,80 +15327,88 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15364,8 +15416,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-346",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15374,8 +15426,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15385,7 +15437,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-272",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15394,8 +15446,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15404,8 +15456,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15414,8 +15466,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-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15424,8 +15476,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-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15434,8 +15486,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-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15444,8 +15496,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-1166",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15454,8 +15506,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-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15464,8 +15516,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15474,8 +15526,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-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15484,8 +15536,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-1405",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15494,8 +15546,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-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15504,8 +15556,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-147",
-   "self_type" : "type-146",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15514,8 +15566,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-1539",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15524,8 +15576,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-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15544,8 +15596,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-237",
-   "self_type" : "type-236",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15554,8 +15606,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-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15564,8 +15616,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-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15574,8 +15626,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-642",
-   "self_type" : "type-641",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15584,8 +15636,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-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15594,8 +15646,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15604,8 +15656,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-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-851",
+   "self_type" : "type-850",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15614,8 +15666,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-893",
-   "self_type" : "type-892",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15624,8 +15676,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-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15634,8 +15686,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-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15644,8 +15696,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-1181",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15654,8 +15706,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-1254",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15664,8 +15716,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15674,8 +15726,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-1387",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15684,8 +15736,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-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15694,8 +15746,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-1571",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15704,8 +15756,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15714,8 +15766,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15724,8 +15776,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-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15734,8 +15786,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-697",
-   "self_type" : "type-696",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15744,8 +15796,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-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15754,8 +15806,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-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15764,8 +15816,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-1041",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "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"
   },
@@ -15774,8 +15826,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-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "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"
   },
@@ -15784,8 +15836,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-1179",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "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"
   },
@@ -15794,8 +15846,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-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "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"
   },
@@ -15804,8 +15856,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-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "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"
   },
@@ -15814,8 +15866,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-1385",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "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"
   },
@@ -15824,8 +15876,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-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1513",
+   "self_type" : "type-1512",
    "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"
   },
@@ -15834,8 +15886,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-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "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"
   },
@@ -15844,8 +15896,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -15854,8 +15906,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -15864,8 +15916,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-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "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"
   },
@@ -15874,8 +15926,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-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-716",
+   "self_type" : "type-715",
    "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"
   },
@@ -15884,8 +15936,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "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"
   },
@@ -15894,8 +15946,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-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
    "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"
   },
@@ -15904,8 +15956,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-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1038",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15914,8 +15966,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-1099",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15924,8 +15976,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-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1187",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15934,8 +15986,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-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1259",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15944,8 +15996,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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15954,8 +16006,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-1320",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15964,8 +16016,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
    "size" : 12,
    "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"
   },
@@ -15974,368 +16026,278 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
-   "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-1546",
-   "self_type" : "type-1545",
-   "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-156",
-   "self_type" : "type-155",
-   "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-402",
-   "self_type" : "type-401",
-   "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-563",
-   "self_type" : "type-562",
-   "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-651",
-   "self_type" : "type-650",
-   "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-834",
-   "self_type" : "type-833",
-   "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-1542",
-   "self_type" : "type-1541",
-   "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-646",
-   "self_type" : "type-645",
-   "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-1281",
-   "self_type" : "type-1280",
-   "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-397",
-   "self_type" : "type-396",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "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-373",
-   "self_type" : "type-372",
-   "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-1094",
-   "self_type" : "type-1093",
-   "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-1162",
-   "self_type" : "type-1161",
-   "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-1231",
-   "self_type" : "type-1230",
-   "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-1308",
-   "self_type" : "type-1307",
-   "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-1360",
-   "self_type" : "type-1359",
-   "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-986",
-   "self_type" : "type-985",
-   "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-1092",
-   "self_type" : "type-1091",
-   "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-1160",
-   "self_type" : "type-1159",
-   "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-1229",
-   "self_type" : "type-1228",
-   "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-1306",
-   "self_type" : "type-1305",
-   "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-1358",
-   "self_type" : "type-1357",
-   "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-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::vector<int, std::allocator<int> >",
-   "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "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-822",
-   "self_type" : "type-821",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1056",
-   "self_type" : "type-1055",
-   "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-1124",
-   "self_type" : "type-1123",
-   "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-1189",
-   "self_type" : "type-1188",
-   "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-1242",
-   "self_type" : "type-1241",
-   "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-1265",
-   "self_type" : "type-1264",
-   "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-1337",
-   "self_type" : "type-1336",
-   "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-1391",
-   "self_type" : "type-1390",
-   "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-1410",
-   "self_type" : "type-1409",
-   "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-1500",
    "self_type" : "type-1499",
    "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-163",
+   "self_type" : "type-162",
+   "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-407",
+   "self_type" : "type-406",
+   "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-574",
+   "self_type" : "type-573",
+   "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-662",
+   "self_type" : "type-661",
+   "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-856",
+   "self_type" : "type-855",
+   "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-1564",
+   "self_type" : "type-1563",
+   "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-658",
+   "self_type" : "type-657",
+   "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-1291",
+   "self_type" : "type-1290",
+   "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-402",
+   "self_type" : "type-401",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
+   "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-378",
+   "self_type" : "type-377",
+   "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-1007",
+   "self_type" : "type-1006",
+   "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-1113",
+   "self_type" : "type-1112",
+   "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-1183",
+   "self_type" : "type-1182",
+   "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-1251",
+   "self_type" : "type-1250",
+   "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-1330",
+   "self_type" : "type-1329",
+   "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-1382",
+   "self_type" : "type-1381",
+   "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-1111",
+   "self_type" : "type-1110",
+   "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-1181",
+   "self_type" : "type-1180",
+   "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-1249",
+   "self_type" : "type-1248",
+   "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-1328",
+   "self_type" : "type-1327",
+   "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-1380",
+   "self_type" : "type-1379",
+   "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-997",
+   "self_type" : "type-996",
+   "size" : 8,
+   "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-134",
+   "self_type" : "type-133",
+   "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-844",
+   "self_type" : "type-843",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1552",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16344,8 +16306,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-1574",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16354,8 +16316,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-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1209",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16364,8 +16326,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16374,8 +16336,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16384,8 +16346,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-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16394,8 +16356,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-590",
-   "self_type" : "type-589",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16404,8 +16366,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16414,8 +16376,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-700",
-   "self_type" : "type-699",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16424,8 +16386,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16434,8 +16396,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-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16444,8 +16406,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
+   "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-221",
+   "self_type" : "type-220",
+   "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-267",
+   "self_type" : "type-266",
+   "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-391",
+   "self_type" : "type-390",
+   "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-602",
+   "self_type" : "type-601",
+   "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-674",
+   "self_type" : "type-673",
+   "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-722",
+   "self_type" : "type-721",
+   "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-786",
+   "self_type" : "type-785",
+   "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-891",
+   "self_type" : "type-890",
+   "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-925",
+   "self_type" : "type-924",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +16506,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16465,7 +16517,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16475,7 +16527,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16493,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-296",
+   "referenced_type" : "type-22",
+   "self_type" : "type-301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16502,8 +16554,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-480",
+   "referenced_type" : "type-21",
+   "self_type" : "type-493",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -16517,14 +16569,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16536,17 +16588,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-431"
     }
    ],
    "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-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-320", "type-428" ],
+   "template_args" : [ "type-325", "type-439" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16556,17 +16608,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-308",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-302" ],
+   "template_args" : [ "type-307" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -16576,17 +16628,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-418" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16596,14 +16648,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16615,14 +16667,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-477"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16632,7 +16684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-308"
     }
    ],
    "fields" :
@@ -16641,20 +16693,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16666,14 +16718,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16685,14 +16737,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16704,14 +16756,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16724,14 +16776,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -16771,8 +16823,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -16782,8 +16834,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16793,8 +16845,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16826,8 +16878,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16838,17 +16890,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-430"
     }
    ],
    "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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-432" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16895,14 +16947,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16960,14 +17012,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-326"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-325",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16979,14 +17031,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16997,7 +17049,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -17006,25 +17058,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-479"
     },
     {
      "access" : "private",
@@ -17036,19 +17088,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-544"
     },
     {
      "access" : "private",
@@ -17060,8 +17112,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -17151,17 +17203,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -17206,17 +17258,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-436",
+   "self_type" : "type-436",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-357" ],
+   "template_args" : [ "type-362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -17261,17 +17313,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-380" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -17316,17 +17368,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-423" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -17373,7 +17425,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
@@ -17385,20 +17437,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -17450,14 +17502,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -17487,23 +17539,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-698"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-684"
+     "referenced_type" : "type-699"
     }
    ],
    "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-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-404" ],
+   "template_args" : [ "type-364", "type-419" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -17513,23 +17565,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-704"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-705"
     }
    ],
    "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-688",
-   "self_type" : "type-688",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-16" ],
+   "template_args" : [ "type-364", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -17539,23 +17591,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-380"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-381"
     }
    ],
    "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-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-377", "type-379" ],
+   "template_args" : [ "type-382", "type-384" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -17565,23 +17617,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -17591,23 +17643,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -17648,18 +17700,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-281"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -17741,14 +17793,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -17760,13 +17812,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -17783,11 +17835,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -17795,7 +17847,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17804,17 +17856,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -17822,7 +17874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17831,17 +17883,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -17849,7 +17901,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17858,17 +17910,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -17876,7 +17928,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17885,17 +17937,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -17903,7 +17955,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17912,17 +17964,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -17930,7 +17982,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17939,17 +17991,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-1213",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -17957,7 +18009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17966,17 +18018,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -17984,7 +18036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17993,17 +18045,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -18011,17 +18063,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -18060,34 +18112,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-708",
+   "self_type" : "type-708",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-697" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-711",
+   "self_type" : "type-711",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-703" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-409",
+   "self_type" : "type-409",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-379" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-665",
+   "self_type" : "type-665",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-413",
+   "self_type" : "type-413",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -18126,8 +18278,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -18139,14 +18291,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -18155,8 +18307,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -18165,8 +18317,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -18175,8 +18327,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -18212,7 +18364,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -18223,8 +18375,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -18253,16 +18405,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18271,16 +18423,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-638"
     }
    ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -18289,16 +18441,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -18307,16 +18459,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-996"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -18326,7 +18478,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
@@ -18337,8 +18489,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1017",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -18349,16 +18501,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -18368,7 +18520,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -18379,8 +18531,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -18391,16 +18543,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -18410,7 +18562,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -18421,8 +18573,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -18434,7 +18586,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-981"
+     "referenced_type" : "type-1002"
     },
     {
      "field_name" : "_pad",
@@ -18445,8 +18597,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-980",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -18458,7 +18610,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-639"
     },
     {
      "field_name" : "_pad",
@@ -18469,8 +18621,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -18481,13 +18633,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -18500,7 +18652,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -18511,8 +18663,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -18523,13 +18675,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -18542,7 +18694,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -18553,8 +18705,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -18563,8 +18715,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -18582,14 +18734,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -18598,11 +18750,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-998",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -18612,16 +18764,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1004"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-982",
-   "self_type" : "type-982",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -18629,7 +18781,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-365"
     }
    ],
    "fields" :
@@ -18638,7 +18790,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -18650,13 +18802,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -18736,13 +18888,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -18824,19 +18976,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -18848,7 +19000,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -18860,13 +19012,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -18878,7 +19030,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -18890,13 +19042,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -18920,13 +19072,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -18939,7 +19091,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
@@ -18951,16 +19103,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18970,7 +19122,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-637"
     },
     {
      "access" : "private",
@@ -18982,16 +19134,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -19001,7 +19153,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -19013,16 +19165,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -19032,7 +19184,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-995"
+     "referenced_type" : "type-1016"
     },
     {
      "access" : "private",
@@ -19044,16 +19196,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1015",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -19061,7 +19213,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-645"
     }
    ],
    "fields" :
@@ -19069,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-641"
     }
    ],
    "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-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -19088,7 +19240,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -19100,13 +19252,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -19119,19 +19271,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -19141,10 +19293,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19153,13 +19305,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -19281,10 +19433,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-423"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19293,19 +19445,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-422"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -19488,10 +19640,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19500,19 +19652,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "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",
@@ -19648,13 +19800,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "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"
@@ -19665,13 +19817,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -19780,7 +19932,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19789,13 +19941,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -19917,7 +20069,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19926,13 +20078,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -20054,10 +20206,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20066,19 +20218,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -20285,10 +20437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20297,19 +20449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -20495,10 +20647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20507,19 +20659,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "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",
@@ -20668,10 +20820,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20680,19 +20832,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1083",
    "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",
@@ -20820,13 +20972,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -20968,12 +21120,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -20983,18 +21135,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -21004,13 +21156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -21123,7 +21275,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21132,13 +21284,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -21260,10 +21412,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21272,19 +21424,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -21494,10 +21646,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21506,19 +21658,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "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",
@@ -21670,13 +21822,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -21821,7 +21973,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21830,13 +21982,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -21958,7 +22110,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21967,13 +22119,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -22095,10 +22247,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22107,19 +22259,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -22305,10 +22457,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22317,19 +22469,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -22554,10 +22706,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22566,19 +22718,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "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",
@@ -22706,10 +22858,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22718,19 +22870,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "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",
@@ -22897,13 +23049,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -23016,13 +23168,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -23189,17 +23341,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-545"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-534" ],
+   "template_args" : [ "type-546" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -23209,17 +23361,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-503" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -23229,17 +23381,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-952" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -23249,17 +23401,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-440"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-431" ],
+   "template_args" : [ "type-442" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -23269,17 +23421,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-938" ],
+   "template_args" : [ "type-959" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -23289,17 +23441,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -23309,17 +23461,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -23329,17 +23481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-617"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-610" ],
+   "template_args" : [ "type-622" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -23349,157 +23501,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-917",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-353" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-356" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-366"
+    }
+   ],
+   "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-937",
+   "self_type" : "type-937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-358" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-360"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-361" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -23509,69 +23661,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23581,52 +23733,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23636,8 +23788,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23647,85 +23799,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-550",
+   "self_type" : "type-550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23735,52 +23887,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23790,8 +23942,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23801,85 +23953,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23889,52 +24041,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-686",
+   "self_type" : "type-686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23944,8 +24096,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-732",
+   "self_type" : "type-732",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23955,107 +24107,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-320" ],
+   "template_args" : [ "type-325" ],
    "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-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-317" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-562",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -24065,52 +24217,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -24120,8 +24272,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-734",
+   "self_type" : "type-734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -24131,33 +24283,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-650",
+   "self_type" : "type-650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -24167,23 +24319,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -24193,23 +24345,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-930",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-914" ],
+   "template_args" : [ "type-934" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -24219,23 +24371,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -24245,23 +24397,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -24270,18 +24422,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -24297,18 +24449,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-466"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -24319,7 +24471,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-462"
     },
     {
      "field_name" : "num_planes",
@@ -24329,13 +24481,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-453"
+     "referenced_type" : "type-464"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -24346,12 +24498,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-461"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bits_per_component",
@@ -24386,8 +24538,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -24398,38 +24550,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -24440,18 +24592,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -24462,17 +24614,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "ystride",
@@ -24492,13 +24644,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -24508,13 +24660,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -24525,35 +24677,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-350"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-345"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-344"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-342"
     }
    ],
    "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-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "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)"
@@ -24574,8 +24726,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -24586,12 +24738,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24616,13 +24768,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-342",
+   "self_type" : "type-342",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -24633,12 +24785,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24668,13 +24820,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -24685,12 +24837,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24720,13 +24872,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -24737,12 +24889,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24777,13 +24929,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -24827,8 +24979,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24836,8 +24988,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24845,8 +24997,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-954",
-   "self_type" : "type-957",
+   "referenced_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24854,8 +25006,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-1073",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24863,8 +25015,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-1144",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24872,8 +25024,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-1213",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24881,8 +25033,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-1291",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24890,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-283",
+   "referenced_type" : "type-151",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24899,8 +25051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-394",
+   "referenced_type" : "type-19",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24909,7 +25061,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-707",
+   "self_type" : "type-723",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24917,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-687",
+   "referenced_type" : "type-419",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -24926,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-324",
+   "referenced_type" : "type-20",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24935,8 +25087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-268",
-   "self_type" : "type-278",
+   "referenced_type" : "type-273",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24944,8 +25096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-276",
-   "self_type" : "type-282",
+   "referenced_type" : "type-281",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24953,8 +25105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24962,8 +25114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-502",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24971,8 +25123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-428",
-   "self_type" : "type-515",
+   "referenced_type" : "type-439",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24980,8 +25132,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-917",
-   "self_type" : "type-949",
+   "referenced_type" : "type-937",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24989,8 +25141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-507",
+   "referenced_type" : "type-505",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24998,8 +25150,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-85",
-   "self_type" : "type-592",
+   "referenced_type" : "type-94",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25007,8 +25159,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-181",
-   "self_type" : "type-942",
+   "referenced_type" : "type-188",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25016,8 +25168,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-61",
-   "self_type" : "type-946",
+   "referenced_type" : "type-68",
+   "self_type" : "type-969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25025,8 +25177,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25034,8 +25186,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-70",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25043,8 +25195,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25052,8 +25204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-379",
-   "self_type" : "type-389",
+   "referenced_type" : "type-384",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25061,8 +25213,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-359",
-   "self_type" : "type-686",
+   "referenced_type" : "type-364",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25070,8 +25222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-377",
-   "self_type" : "type-388",
+   "referenced_type" : "type-382",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25079,8 +25231,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-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25088,8 +25240,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-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25097,8 +25249,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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25106,8 +25258,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-1244",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25115,8 +25267,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-1325",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25124,8 +25276,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25133,8 +25285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25142,8 +25294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25151,8 +25303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25160,8 +25312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25169,8 +25321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25178,8 +25330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25187,8 +25339,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25196,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25205,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25214,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25223,8 +25375,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25232,8 +25384,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/x86_64/source-based/libhidltransport.so.lsdump b/Q/64/x86_64/source-based/libhidltransport.so.lsdump
index d314f4e..ae741de 100644
--- a/Q/64/x86_64/source-based/libhidltransport.so.lsdump
+++ b/Q/64/x86_64/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-338",
+   "referenced_type" : "type-146",
+   "self_type" : "type-343",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [64]",
+   "name" : "char [64]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-410",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-39",
-   "self_type" : "type-455",
+   "referenced_type" : "type-25",
+   "self_type" : "type-466",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-982",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1003",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-345",
+   "referenced_type" : "type-103",
+   "self_type" : "type-350",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-447",
+   "self_type" : "type-458",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -69,8 +78,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -79,24 +88,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -150,8 +159,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -180,8 +189,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 8
   },
   {
@@ -190,15 +199,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1772,10 +1781,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEmRKT_"
   },
   {
@@ -1784,10 +1789,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1824,10 +1825,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1840,14 +1837,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2647,8 +2636,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2665,8 +2654,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2683,8 +2672,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2709,8 +2698,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2739,8 +2728,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2761,8 +2750,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2815,8 +2804,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2869,8 +2858,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2895,8 +2884,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2913,8 +2902,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/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-2",
@@ -2939,11 +2928,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -2989,8 +2978,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3043,8 +3032,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3069,8 +3058,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3111,8 +3100,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3353,8 +3342,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3383,8 +3372,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3413,8 +3402,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3455,8 +3444,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3493,8 +3482,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3519,8 +3508,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3537,8 +3526,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3567,8 +3556,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3661,8 +3650,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-443",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3703,8 +3692,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3721,8 +3710,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3751,8 +3740,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3785,8 +3774,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3839,8 +3828,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3856,12 +3845,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     }
    ],
-   "referenced_type" : "type-459",
+   "referenced_type" : "type-470",
    "return_type" : "type-2",
-   "self_type" : "type-459",
+   "self_type" : "type-470",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3874,10 +3863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3887,10 +3876,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-78"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3900,16 +3889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3919,13 +3908,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1613"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3935,13 +3924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1614"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3951,13 +3940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3967,13 +3956,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1615"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3983,13 +3972,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1616"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3999,10 +3988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4012,10 +4001,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4025,10 +4014,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4038,16 +4027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4056,14 +4045,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4074,13 +4063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1619"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4090,13 +4079,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4106,13 +4095,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1343"
+     "referenced_type" : "type-1365"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4121,16 +4110,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1599"
+     "referenced_type" : "type-1622"
     }
    ],
    "return_type" : "type-2",
@@ -4143,16 +4132,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
      "default_arg" : true,
@@ -4160,7 +4149,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1623"
     }
    ],
    "return_type" : "type-2",
@@ -4172,16 +4161,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1624"
     }
    ],
    "return_type" : "type-2",
@@ -4195,13 +4184,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1625"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4210,16 +4199,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1626"
     }
    ],
    "return_type" : "type-2",
@@ -4231,16 +4220,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1627"
     }
    ],
    "return_type" : "type-2",
@@ -4252,16 +4241,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1628"
     }
    ],
    "return_type" : "type-2",
@@ -4273,16 +4262,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1629"
     }
    ],
    "return_type" : "type-2",
@@ -4294,16 +4283,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1630"
     }
    ],
    "return_type" : "type-2",
@@ -4317,10 +4306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4330,13 +4319,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4346,19 +4335,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4368,13 +4357,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4384,19 +4373,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1390"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4406,10 +4395,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4419,10 +4408,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4432,10 +4421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4444,13 +4433,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4459,19 +4448,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4481,16 +4470,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4500,13 +4489,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1631"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4516,13 +4505,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1632"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4532,13 +4521,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4548,13 +4537,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1633"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4563,16 +4552,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1634"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4581,16 +4570,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1635"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4600,13 +4589,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1636"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4615,16 +4604,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1637"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4634,10 +4623,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4647,10 +4636,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4659,16 +4648,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1638"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4677,13 +4666,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4692,13 +4681,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1368"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4708,10 +4697,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4721,16 +4710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4740,13 +4729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4756,13 +4745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4772,14 +4761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4789,16 +4778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4808,13 +4797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1639"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4824,13 +4813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1640"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4840,14 +4829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4857,13 +4846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4873,13 +4862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4889,11 +4878,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     }
    ],
    "return_type" : "type-2",
@@ -4906,13 +4895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4922,10 +4911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4935,10 +4924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4947,13 +4936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4963,10 +4952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4976,16 +4965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4994,14 +4983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5010,14 +4999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5028,13 +5017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1645"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5044,13 +5033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5060,13 +5049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5075,16 +5064,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1651"
     }
    ],
    "return_type" : "type-2",
@@ -5097,16 +5086,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
      "default_arg" : true,
@@ -5114,7 +5103,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1652"
     }
    ],
    "return_type" : "type-2",
@@ -5128,13 +5117,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1653"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5143,16 +5132,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1654"
     }
    ],
    "return_type" : "type-2",
@@ -5164,16 +5153,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1655"
     }
    ],
    "return_type" : "type-2",
@@ -5185,16 +5174,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1656"
     }
    ],
    "return_type" : "type-2",
@@ -5206,16 +5195,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1657"
     }
    ],
    "return_type" : "type-2",
@@ -5227,16 +5216,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1635"
+     "referenced_type" : "type-1658"
     }
    ],
    "return_type" : "type-2",
@@ -5250,10 +5239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5262,16 +5251,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-1659"
     }
    ],
    "return_type" : "type-2",
@@ -5283,16 +5272,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
-     "referenced_type" : "type-1637"
+     "referenced_type" : "type-1660"
     }
    ],
    "return_type" : "type-2",
@@ -5305,13 +5294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5321,13 +5310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5337,10 +5326,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5350,10 +5339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5363,10 +5352,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5375,16 +5364,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1661"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5394,16 +5383,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5413,13 +5402,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1639"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5429,13 +5418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5445,16 +5434,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5464,13 +5453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5480,13 +5469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5495,16 +5484,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5514,16 +5503,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5532,19 +5521,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5554,13 +5543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5569,19 +5558,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5591,10 +5580,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5604,10 +5593,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5617,19 +5606,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5639,16 +5628,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5657,22 +5646,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5681,19 +5670,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5703,16 +5692,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5722,16 +5711,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5741,13 +5730,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5757,10 +5746,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5770,16 +5759,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5788,19 +5777,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5809,19 +5798,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5831,13 +5820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5847,13 +5836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5863,13 +5852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5879,14 +5868,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5896,16 +5885,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5915,13 +5904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5931,13 +5920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5947,14 +5936,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5964,13 +5953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5980,13 +5969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5996,11 +5985,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     }
    ],
    "return_type" : "type-2",
@@ -6013,13 +6002,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1651"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6029,10 +6018,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6042,10 +6031,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6054,13 +6043,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6070,10 +6059,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6083,16 +6072,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6101,14 +6090,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "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"
   },
   {
@@ -6117,14 +6106,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "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"
   },
   {
@@ -6135,13 +6124,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-1677"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6151,13 +6140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6167,13 +6156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1083"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6182,10 +6171,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1047"
+     "referenced_type" : "type-1065"
     },
     {
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-12"
@@ -6203,10 +6192,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1047"
+     "referenced_type" : "type-1065"
     },
     {
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1031"
     },
     {
      "referenced_type" : "type-12"
@@ -6225,16 +6214,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1136"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
      "default_arg" : true,
@@ -6242,7 +6231,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1680"
     }
    ],
    "return_type" : "type-2",
@@ -6256,13 +6245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1681"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6271,16 +6260,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1136"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1682"
     }
    ],
    "return_type" : "type-2",
@@ -6294,10 +6283,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6307,13 +6296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6323,13 +6312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6339,10 +6328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6352,10 +6341,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6365,10 +6354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6378,16 +6367,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6397,13 +6386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1683"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6413,13 +6402,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6429,13 +6418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6445,13 +6434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6461,19 +6450,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6483,13 +6472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6498,22 +6487,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6523,10 +6512,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6536,10 +6525,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6549,10 +6538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6562,16 +6551,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6581,13 +6570,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6597,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-943"
+     "referenced_type" : "type-965"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6613,14 +6602,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6630,16 +6619,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6649,13 +6638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6665,13 +6654,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6681,14 +6670,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6698,13 +6687,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6714,13 +6703,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6730,11 +6719,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     }
    ],
    "return_type" : "type-2",
@@ -6747,13 +6736,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6763,10 +6752,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6776,10 +6765,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6788,13 +6777,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6804,10 +6793,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6817,16 +6806,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6835,14 +6824,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6851,14 +6840,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6867,14 +6856,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "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"
   },
   {
@@ -6885,13 +6874,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-1670"
+     "referenced_type" : "type-1693"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6901,13 +6890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6917,13 +6906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1152"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6933,16 +6922,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1203"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
      "default_arg" : true,
@@ -6950,7 +6939,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1699"
     }
    ],
    "return_type" : "type-2",
@@ -6964,13 +6953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1700"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6979,16 +6968,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1203"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1701"
     }
    ],
    "return_type" : "type-2",
@@ -7002,10 +6991,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7015,13 +7004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7031,13 +7020,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7047,10 +7036,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7060,10 +7049,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7073,10 +7062,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7086,16 +7075,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7105,13 +7094,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1702"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7121,13 +7110,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7137,16 +7126,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7156,13 +7145,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7172,13 +7161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7188,16 +7177,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7207,13 +7196,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7223,10 +7212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7236,10 +7225,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7249,19 +7238,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7271,16 +7260,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7290,19 +7279,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7311,22 +7300,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1138"
+     "referenced_type" : "type-1157"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7336,16 +7325,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7355,16 +7344,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7374,13 +7363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7390,10 +7379,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7403,16 +7392,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7422,13 +7411,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7438,13 +7427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7454,13 +7443,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7470,14 +7459,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7487,16 +7476,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7506,13 +7495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1709"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7522,13 +7511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1710"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7538,14 +7527,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7555,13 +7544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7571,13 +7560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1711"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7587,11 +7576,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     }
    ],
    "return_type" : "type-2",
@@ -7604,13 +7593,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7620,10 +7609,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7633,10 +7622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7645,13 +7634,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7661,10 +7650,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7674,16 +7663,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7692,14 +7681,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "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"
   },
   {
@@ -7708,14 +7697,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "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"
   },
   {
@@ -7725,14 +7714,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7742,16 +7731,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7761,13 +7750,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1713"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7777,13 +7766,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1714"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7793,14 +7782,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7810,13 +7799,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7826,13 +7815,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1715"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7842,11 +7831,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     }
    ],
    "return_type" : "type-2",
@@ -7859,13 +7848,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7875,10 +7864,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7888,10 +7877,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7900,13 +7889,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7916,10 +7905,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7929,16 +7918,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7947,14 +7936,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -7963,14 +7952,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -7979,14 +7968,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -7995,14 +7984,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "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"
   },
   {
@@ -8013,13 +8002,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1696"
+     "referenced_type" : "type-1719"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8029,13 +8018,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8045,13 +8034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1197"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8062,13 +8051,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-1701"
+     "referenced_type" : "type-1724"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8078,13 +8067,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8094,13 +8083,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8110,16 +8099,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1280"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
      "default_arg" : true,
@@ -8127,7 +8116,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1708"
+     "referenced_type" : "type-1731"
     }
    ],
    "return_type" : "type-2",
@@ -8141,13 +8130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1732"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8156,16 +8145,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1257"
+     "referenced_type" : "type-1280"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1733"
     }
    ],
    "return_type" : "type-2",
@@ -8179,10 +8168,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8192,13 +8181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8208,13 +8197,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8224,10 +8213,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8237,10 +8226,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8250,10 +8239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8263,16 +8252,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
      "default_arg" : true,
@@ -8280,7 +8269,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-1734"
     }
    ],
    "return_type" : "type-2",
@@ -8294,13 +8283,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-1735"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8309,16 +8298,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-1736"
     }
    ],
    "return_type" : "type-2",
@@ -8330,16 +8319,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1714"
+     "referenced_type" : "type-1737"
     }
    ],
    "return_type" : "type-2",
@@ -8351,16 +8340,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1715"
+     "referenced_type" : "type-1738"
     }
    ],
    "return_type" : "type-2",
@@ -8372,16 +8361,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1716"
+     "referenced_type" : "type-1739"
     }
    ],
    "return_type" : "type-2",
@@ -8393,16 +8382,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1336"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1717"
+     "referenced_type" : "type-1740"
     }
    ],
    "return_type" : "type-2",
@@ -8416,10 +8405,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8429,13 +8418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8445,13 +8434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8461,10 +8450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8474,10 +8463,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8487,10 +8476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8500,16 +8489,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8519,13 +8508,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1718"
+     "referenced_type" : "type-1741"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8535,13 +8524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8551,13 +8540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8567,13 +8556,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8582,19 +8571,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1224"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8604,13 +8593,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1721"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8620,10 +8609,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8633,10 +8622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8646,10 +8635,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8659,16 +8648,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8678,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8697,13 +8686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8713,13 +8702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8729,16 +8718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8748,19 +8737,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8770,13 +8759,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1722"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8786,13 +8775,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1723"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8802,16 +8791,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8821,19 +8810,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8843,13 +8832,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8859,13 +8848,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1747"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8875,16 +8864,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1725"
+     "referenced_type" : "type-1748"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8893,22 +8882,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8917,22 +8906,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8942,13 +8931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1726"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8958,10 +8947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8971,10 +8960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8984,22 +8973,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9009,16 +8998,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9028,19 +9017,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9050,16 +9039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9069,16 +9058,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9088,19 +9077,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9109,25 +9098,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9136,19 +9125,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-1751"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9157,19 +9146,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1301"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9179,16 +9168,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9198,16 +9187,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9217,13 +9206,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9233,10 +9222,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9246,16 +9235,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1033"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9265,13 +9254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9281,13 +9270,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9297,13 +9286,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9312,12 +9301,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-406", "type-153" ]
+   "template_args" : [ "type-31", "type-420", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9325,12 +9314,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9338,12 +9327,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-70", "type-202", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9351,12 +9340,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-705"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9364,10 +9353,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-375"
     }
    ],
    "return_type" : "type-2",
@@ -9379,10 +9368,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-561"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     }
    ],
    "return_type" : "type-2",
@@ -9394,10 +9383,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
    "return_type" : "type-2",
@@ -9409,10 +9398,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-291",
+   "return_type" : "type-296",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9421,13 +9410,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9442,19 +9431,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9463,10 +9452,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-377"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9494,14 +9483,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-576"
     }
    ],
    "return_type" : "type-2",
@@ -9514,10 +9503,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9527,16 +9516,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9545,7 +9534,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "referenced_type" : "type-2"
@@ -9554,7 +9543,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9569,10 +9558,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9590,10 +9579,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9611,10 +9600,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-12"
@@ -9635,10 +9624,10 @@
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9647,10 +9636,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9668,10 +9657,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9689,10 +9678,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-12"
@@ -9710,28 +9699,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-428",
+   "return_type" : "type-439",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9741,13 +9730,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-369"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9757,10 +9746,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
-   "return_type" : "type-354",
+   "return_type" : "type-359",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9770,19 +9759,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9792,19 +9781,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9816,22 +9805,22 @@
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9840,18 +9829,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-953",
+   "return_type" : "type-976",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9859,18 +9848,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1072",
+   "return_type" : "type-1093",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9878,18 +9867,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9897,18 +9886,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1143",
+   "return_type" : "type-1162",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9916,18 +9905,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1212",
+   "return_type" : "type-1232",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-70", "type-24", "type-202" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9935,18 +9924,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9954,18 +9943,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9973,18 +9962,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1290",
+   "return_type" : "type-1312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -9992,10 +9981,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-749",
+   "return_type" : "type-764",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10004,12 +9993,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10017,25 +10006,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-61",
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
-  },
-  {
-   "function_name" : "android::hardware::details::wrapPassthrough",
-   "linker_set_key" : "_ZN7android8hardware7details15wrapPassthroughINS_4hidl7manager4V1_215IClientCallbackEvEENS_2spIT_EES9_",
-   "parameters" :
-   [
-    {
      "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-70", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
+  },
+  {
+   "function_name" : "android::hardware::details::wrapPassthrough",
+   "linker_set_key" : "_ZN7android8hardware7details15wrapPassthroughINS_4hidl7manager4V1_215IClientCallbackEvEENS_2spIT_EES9_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-75"
+    }
+   ],
+   "return_type" : "type-75",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10043,17 +10032,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10068,13 +10057,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10083,18 +10072,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1040"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10102,18 +10091,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10121,18 +10110,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10140,18 +10129,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1260"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-68",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-70", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10159,29 +10148,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1341"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10190,19 +10179,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10211,10 +10200,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10223,10 +10212,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10235,10 +10224,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10250,79 +10239,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-215",
+   "referenced_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-763",
+   "referenced_type" : "type-778",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-764",
+   "referenced_type" : "type-779",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-374",
+   "referenced_type" : "type-409",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10332,8 +10321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-466",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10341,8 +10330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-476",
+   "referenced_type" : "type-483",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10350,8 +10339,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-329",
+   "referenced_type" : "type-325",
+   "self_type" : "type-334",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10359,17 +10348,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-317",
+   "referenced_type" : "type-317",
+   "self_type" : "type-322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.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-696",
+   "self_type" : "type-708",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-702",
+   "self_type" : "type-711",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10377,8 +10384,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10386,8 +10393,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10395,8 +10402,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10404,8 +10411,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10413,8 +10420,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10422,8 +10429,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-953",
-   "self_type" : "type-957",
+   "referenced_type" : "type-976",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10431,8 +10438,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-1072",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1096",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10440,8 +10447,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-1143",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10449,8 +10456,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-1212",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10458,8 +10465,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-1290",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1315",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10467,8 +10474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-294",
+   "referenced_type" : "type-151",
+   "self_type" : "type-299",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10476,8 +10483,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-400",
+   "referenced_type" : "type-19",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10494,8 +10501,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-978",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1067",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10503,8 +10510,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-626",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1063",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10512,8 +10519,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10521,8 +10528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10530,8 +10537,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-981",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10539,8 +10546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-281",
+   "referenced_type" : "type-281",
+   "self_type" : "type-286",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10548,8 +10555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1064",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10557,8 +10564,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-977",
-   "self_type" : "type-987",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1007",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10566,8 +10573,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-625",
-   "self_type" : "type-976",
+   "referenced_type" : "type-636",
+   "self_type" : "type-997",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10575,8 +10582,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-632",
-   "self_type" : "type-636",
+   "referenced_type" : "type-644",
+   "self_type" : "type-647",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10584,8 +10591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10593,8 +10600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-164",
+   "referenced_type" : "type-140",
+   "self_type" : "type-171",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10602,8 +10609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-518",
+   "referenced_type" : "type-439",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10611,8 +10618,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10620,8 +10627,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-916",
-   "self_type" : "type-949",
+   "referenced_type" : "type-936",
+   "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10629,8 +10636,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-85",
-   "self_type" : "type-661",
+   "referenced_type" : "type-94",
+   "self_type" : "type-675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10638,8 +10645,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-181",
-   "self_type" : "type-942",
+   "referenced_type" : "type-188",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10647,8 +10654,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-61",
-   "self_type" : "type-944",
+   "referenced_type" : "type-68",
+   "self_type" : "type-966",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10656,8 +10663,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-20",
-   "self_type" : "type-37",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10665,8 +10672,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-68",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10674,8 +10681,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10683,8 +10690,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-379",
-   "self_type" : "type-501",
+   "referenced_type" : "type-384",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10692,8 +10699,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-359",
-   "self_type" : "type-485",
+   "referenced_type" : "type-364",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10701,8 +10708,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
+   "referenced_type" : "type-331",
+   "self_type" : "type-333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10710,8 +10717,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-316",
+   "referenced_type" : "type-319",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10719,8 +10726,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10728,8 +10735,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1136",
    "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"
   },
@@ -10737,8 +10744,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1203",
    "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"
   },
@@ -10746,8 +10753,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10755,8 +10762,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1277",
+   "self_type" : "type-1280",
    "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"
   },
@@ -10764,8 +10771,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1336",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10773,8 +10780,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1393",
    "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"
   },
@@ -10782,8 +10789,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10791,8 +10798,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-960",
+   "referenced_type" : "type-552",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10800,8 +10807,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10809,8 +10816,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-93",
-   "self_type" : "type-551",
+   "referenced_type" : "type-90",
+   "self_type" : "type-561",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10818,8 +10825,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10827,8 +10834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10836,8 +10843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-298",
-   "self_type" : "type-299",
+   "referenced_type" : "type-303",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10845,8 +10852,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-279",
-   "self_type" : "type-280",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10854,8 +10861,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-279",
+   "self_type" : "type-280",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10863,8 +10870,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-1362",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1396",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10872,8 +10879,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-630",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-642",
+   "self_type" : "type-1033",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10881,8 +10888,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-991",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10890,8 +10897,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-637",
-   "self_type" : "type-639",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10899,8 +10906,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-554",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10908,8 +10915,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10917,8 +10924,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-392",
-   "self_type" : "type-393",
+   "referenced_type" : "type-397",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10926,8 +10933,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-990",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1065",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10935,8 +10942,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-519",
-   "self_type" : "type-705",
+   "referenced_type" : "type-530",
+   "self_type" : "type-728",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10944,8 +10951,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10953,8 +10960,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-915",
-   "self_type" : "type-918",
+   "referenced_type" : "type-935",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10962,8 +10969,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-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10971,8 +10978,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-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10980,8 +10987,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10989,24 +10996,6 @@
    "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-60",
-   "self_type" : "type-59",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-30",
-   "self_type" : "type-29",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-67",
    "self_type" : "type-66",
    "size" : 8,
@@ -11014,10 +11003,28 @@
   },
   {
    "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-37",
+   "self_type" : "type-36",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-74",
+   "self_type" : "type-73",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11025,8 +11032,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-499",
-   "self_type" : "type-500",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11034,8 +11041,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1206",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11043,8 +11050,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-362",
-   "self_type" : "type-364",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11052,8 +11059,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-490",
-   "self_type" : "type-491",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11061,8 +11068,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-486",
-   "self_type" : "type-702",
+   "referenced_type" : "type-497",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11070,8 +11077,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-106",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11079,8 +11086,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11088,8 +11095,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-221",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11097,79 +11104,72 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-162",
-   "self_type" : "type-165",
+   "referenced_type" : "type-158",
+   "self_type" : "type-166",
    "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-1086",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1107",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1178",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-118",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1246",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1325",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1377",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1423",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1489",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1528",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11182,79 +11182,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
+   "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-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-547",
-   "self_type" : "type-549",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-558",
+   "self_type" : "type-560",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-633",
+   "self_type" : "type-635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-686",
+   "self_type" : "type-688",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-814",
+   "referenced_type" : "type-739",
+   "self_type" : "type-741",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-887",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-986",
+   "referenced_type" : "type-908",
+   "self_type" : "type-910",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-970",
-   "self_type" : "type-972",
+   "referenced_type" : "type-985",
+   "self_type" : "type-990",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-991",
+   "self_type" : "type-993",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-351",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11262,8 +11269,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-206",
+   "referenced_type" : "type-177",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11271,8 +11278,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11280,8 +11287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-119",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11289,8 +11296,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-1014",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1040",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11298,8 +11305,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-1097",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1119",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11307,8 +11314,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-1167",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1188",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11316,8 +11323,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-1235",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1258",
+   "self_type" : "type-1260",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11325,8 +11332,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-1288",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11334,8 +11341,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-1318",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1341",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11343,8 +11350,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-1366",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1390",
    "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"
   },
@@ -11352,278 +11359,125 @@
    "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-1476",
-   "self_type" : "type-1478",
-   "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-1544",
-   "self_type" : "type-1546",
-   "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-155",
-   "self_type" : "type-157",
-   "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-401",
-   "self_type" : "type-403",
-   "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-562",
-   "self_type" : "type-564",
-   "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-650",
-   "self_type" : "type-652",
-   "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-832",
-   "self_type" : "type-834",
-   "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-1540",
-   "self_type" : "type-1539",
-   "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-645",
-   "self_type" : "type-644",
-   "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-1281",
-   "self_type" : "type-1280",
-   "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-396",
-   "self_type" : "type-395",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
-   "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
-   "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-820",
-   "self_type" : "type-822",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1054",
-   "self_type" : "type-1053",
-   "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-1122",
-   "self_type" : "type-1121",
-   "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-1187",
-   "self_type" : "type-1186",
-   "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-1240",
-   "self_type" : "type-1239",
-   "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-1263",
-   "self_type" : "type-1262",
-   "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-1335",
-   "self_type" : "type-1334",
-   "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-1389",
-   "self_type" : "type-1388",
-   "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-1408",
-   "self_type" : "type-1407",
-   "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-1498",
-   "self_type" : "type-1497",
+   "self_type" : "type-1500",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-1550",
-   "self_type" : "type-1549",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1568",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-1572",
-   "self_type" : "type-1571",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-162",
+   "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-1588",
-   "self_type" : "type-1587",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-406",
+   "self_type" : "type-408",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-213",
-   "self_type" : "type-212",
+   "linker_set_key" : "const std::basic_string<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-576",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-257",
-   "self_type" : "type-256",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-661",
+   "self_type" : "type-663",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-385",
-   "self_type" : "type-384",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-854",
+   "self_type" : "type-856",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-589",
-   "self_type" : "type-588",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1561",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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 *> > *)> > > &",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
    "referenced_type" : "type-657",
    "self_type" : "type-656",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-1291",
+   "self_type" : "type-1290",
+   "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-401",
+   "self_type" : "type-400",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
+   "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-842",
+   "self_type" : "type-844",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11631,8 +11485,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-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11640,8 +11494,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-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11649,8 +11503,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-902",
-   "self_type" : "type-901",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "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-1284",
+   "self_type" : "type-1283",
+   "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-1357",
+   "self_type" : "type-1356",
+   "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-1411",
+   "self_type" : "type-1410",
+   "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-1430",
+   "self_type" : "type-1429",
+   "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-1520",
+   "self_type" : "type-1519",
+   "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-1574",
+   "self_type" : "type-1573",
+   "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-16",
+   "self_type" : "type-15",
+   "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-1600",
+   "self_type" : "type-1599",
+   "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-220",
+   "self_type" : "type-219",
+   "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-266",
+   "self_type" : "type-265",
+   "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-390",
+   "self_type" : "type-389",
+   "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-601",
+   "self_type" : "type-600",
+   "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-672",
+   "self_type" : "type-671",
+   "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-720",
+   "self_type" : "type-719",
+   "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-784",
+   "self_type" : "type-783",
+   "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-889",
+   "self_type" : "type-888",
+   "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-923",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11658,8 +11665,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11668,7 +11675,7 @@
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-170",
-   "self_type" : "type-178",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11676,8 +11683,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11685,8 +11692,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11695,7 +11702,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-309",
+   "self_type" : "type-314",
    "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"
   },
@@ -11703,8 +11710,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-577",
+   "referenced_type" : "type-103",
+   "self_type" : "type-588",
    "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"
   }
@@ -11715,8 +11722,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-471",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -11724,8 +11731,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
+   "referenced_type" : "type-473",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11733,8 +11740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-467",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11742,8 +11749,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-474",
+   "referenced_type" : "type-483",
+   "self_type" : "type-485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11751,8 +11758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-477",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11760,8 +11767,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11769,8 +11776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11778,8 +11785,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11787,8 +11794,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11796,8 +11803,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11805,8 +11812,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11814,8 +11821,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11823,8 +11830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11832,8 +11839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11841,8 +11848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11850,17 +11857,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "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-1556",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11877,8 +11875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11886,8 +11884,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11895,8 +11893,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11904,8 +11902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11913,8 +11911,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-669",
-   "self_type" : "type-668",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11922,8 +11920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11931,8 +11929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-807",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11940,8 +11938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11949,8 +11947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11958,8 +11956,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
+   "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-988",
+   "self_type" : "type-987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11967,8 +11974,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11976,8 +11983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11985,8 +11992,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -11994,8 +12001,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-320",
-   "self_type" : "type-330",
+   "referenced_type" : "type-325",
+   "self_type" : "type-335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12003,8 +12010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-312",
-   "self_type" : "type-318",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12012,8 +12019,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12021,8 +12028,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-494",
+   "referenced_type" : "type-418",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -12030,8 +12037,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12039,8 +12046,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12048,8 +12055,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12057,8 +12064,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12066,8 +12073,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12075,8 +12082,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12084,8 +12091,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12093,8 +12100,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "type-386",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12102,8 +12109,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12111,8 +12118,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12120,8 +12127,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12129,8 +12136,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12138,8 +12145,8 @@
    "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-681",
-   "self_type" : "type-684",
+   "referenced_type" : "type-696",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12147,8 +12154,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-687",
-   "self_type" : "type-690",
+   "referenced_type" : "type-702",
+   "self_type" : "type-705",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12156,8 +12163,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-374",
-   "self_type" : "type-387",
+   "referenced_type" : "type-379",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12165,8 +12172,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-245",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-252",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12174,8 +12181,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-239",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-246",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12192,8 +12199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12201,8 +12208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12210,8 +12217,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12219,8 +12226,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12228,8 +12235,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12237,8 +12244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12246,8 +12253,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12255,8 +12262,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1502",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12264,8 +12271,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12273,8 +12280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12282,8 +12289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12291,8 +12298,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12300,8 +12307,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12309,8 +12316,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12318,8 +12325,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12327,8 +12334,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-704",
-   "self_type" : "type-703",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12336,8 +12343,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-894",
+   "self_type" : "type-893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12345,8 +12352,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12354,8 +12361,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12363,8 +12370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12372,8 +12379,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12381,8 +12388,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12390,8 +12397,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12399,8 +12406,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12408,8 +12415,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12417,8 +12424,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12426,8 +12433,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12435,8 +12442,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12444,8 +12451,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12453,8 +12460,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12462,8 +12469,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12471,8 +12478,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-561",
+   "referenced_type" : "type-570",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -12480,8 +12487,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1035",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12489,8 +12496,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "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"
   },
@@ -12498,26 +12505,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
-   "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-1205",
    "self_type" : "type-1204",
    "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-1214",
+   "self_type" : "type-1213",
+   "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-1259",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "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"
   },
@@ -12525,8 +12532,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12534,8 +12541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
    "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"
   },
@@ -12543,8 +12550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12552,8 +12559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12561,8 +12568,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12570,8 +12577,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12579,8 +12586,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12588,8 +12595,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12597,8 +12604,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12606,8 +12613,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12615,8 +12622,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12624,8 +12631,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-219",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12633,8 +12640,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12642,8 +12649,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-874",
-   "self_type" : "type-873",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12651,8 +12658,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12660,8 +12667,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12669,8 +12676,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12678,8 +12685,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-953",
-   "self_type" : "type-954",
+   "referenced_type" : "type-976",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12687,8 +12694,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-1072",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12696,8 +12703,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-1143",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12705,8 +12712,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-1212",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12714,8 +12721,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-1290",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1313",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12723,8 +12730,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-273",
+   "referenced_type" : "type-151",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12732,8 +12739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-383",
+   "referenced_type" : "type-19",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12742,7 +12749,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-537",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12750,8 +12757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12759,17 +12766,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-707",
+   "self_type" : "type-709",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-710",
+   "self_type" : "type-712",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-409",
+   "self_type" : "type-411",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-664",
+   "self_type" : "type-667",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-413",
+   "self_type" : "type-415",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-405",
+   "referenced_type" : "type-56",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12777,8 +12829,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-72",
+   "self_type" : "type-71",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12786,8 +12838,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12795,8 +12847,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-978",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1066",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12804,8 +12856,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-626",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12813,8 +12865,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-131",
-   "self_type" : "type-159",
+   "referenced_type" : "type-137",
+   "self_type" : "type-165",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12822,8 +12874,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12831,8 +12883,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-305",
+   "referenced_type" : "type-20",
+   "self_type" : "type-310",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12840,8 +12892,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12849,8 +12901,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-358",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12858,8 +12910,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12867,8 +12919,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-277",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12876,8 +12928,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-628",
+   "referenced_type" : "type-141",
+   "self_type" : "type-639",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12885,8 +12937,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-977",
-   "self_type" : "type-983",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12894,8 +12946,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-625",
-   "self_type" : "type-973",
+   "referenced_type" : "type-636",
+   "self_type" : "type-994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12903,8 +12955,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-130",
-   "self_type" : "type-142",
+   "referenced_type" : "type-136",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12912,8 +12964,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-632",
-   "self_type" : "type-634",
+   "referenced_type" : "type-644",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12921,8 +12973,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12930,8 +12982,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-291",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12939,8 +12991,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-333",
+   "referenced_type" : "type-160",
+   "self_type" : "type-338",
    "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"
   },
@@ -12948,8 +13000,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-926",
+   "referenced_type" : "type-420",
+   "self_type" : "type-949",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12957,8 +13009,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12966,8 +13018,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12975,8 +13027,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "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"
   },
@@ -12984,8 +13036,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "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"
   },
@@ -12993,8 +13045,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-925",
+   "referenced_type" : "type-192",
+   "self_type" : "type-948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13002,8 +13054,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-943",
+   "referenced_type" : "type-181",
+   "self_type" : "type-965",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13011,8 +13063,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-924",
+   "referenced_type" : "type-943",
+   "self_type" : "type-946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13020,8 +13072,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13029,8 +13081,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13038,8 +13090,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13047,105 +13099,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-193",
-   "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::hidl::manager::V1_1::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-1135",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
-   "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
-   "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::hidl::manager::V1_2::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
-   "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"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-1198",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1197",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1275",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
-   "name" : "android::hidl::manager::V1_2::IClientCallback *",
    "referenced_type" : "type-70",
    "self_type" : "type-69",
    "size" : 8,
@@ -13153,10 +13106,109 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "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::hidl::manager::V1_1::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1153",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1152",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
+   "name" : "android::hidl::manager::V1_1::IServiceManager *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
+   "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::hidl::manager::V1_2::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "referenced_type" : "type-209",
+   "self_type" : "type-1221",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1220",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1296",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
+   "name" : "android::hidl::manager::V1_2::IClientCallback *",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13164,8 +13216,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13173,8 +13225,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-930",
+   "referenced_type" : "type-950",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13182,8 +13234,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-514",
+   "referenced_type" : "type-439",
+   "self_type" : "type-526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13191,8 +13243,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-78",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13200,8 +13252,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-529",
+   "referenced_type" : "type-536",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13209,8 +13261,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13218,339 +13270,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-916",
-   "self_type" : "type-947",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-506",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-512",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-596",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-603",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-598",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-68",
-   "self_type" : "type-605",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-601",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-498",
-   "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-909",
-   "self_type" : "type-914",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-489",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "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-359",
-   "self_type" : "type-482",
-   "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-449",
-   "self_type" : "type-453",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-351",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-306",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-327",
-   "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-314",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-418",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1021",
-   "self_type" : "type-1022",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1023",
-   "self_type" : "type-1024",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-390",
-   "self_type" : "type-391",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-647",
-   "self_type" : "type-648",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-398",
-   "self_type" : "type-399",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1451",
-   "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-521",
-   "self_type" : "type-523",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-958",
-   "self_type" : "type-959",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1076",
-   "self_type" : "type-1077",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1147",
-   "self_type" : "type-1148",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1218",
-   "self_type" : "type-1219",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1295",
-   "self_type" : "type-1296",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-790",
-   "self_type" : "type-792",
-   "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-80",
    "self_type" : "type-82",
    "size" : 8,
@@ -13558,10 +13277,343 @@
   },
   {
    "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-936",
+   "self_type" : "type-969",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-505",
+   "self_type" : "type-517",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-524",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-607",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-614",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-610",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-612",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-509",
+   "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-929",
+   "self_type" : "type-934",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-501",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-364",
+   "self_type" : "type-490",
+   "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-460",
+   "self_type" : "type-464",
+   "size" : 8,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-356",
+   "size" : 8,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-331",
+   "self_type" : "type-332",
+   "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-319",
+   "self_type" : "type-320",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-429",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1043",
+   "self_type" : "type-1044",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1045",
+   "self_type" : "type-1046",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-395",
+   "self_type" : "type-396",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-659",
+   "self_type" : "type-660",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-403",
+   "self_type" : "type-404",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1473",
+   "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-533",
+   "self_type" : "type-535",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-980",
+   "self_type" : "type-981",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1097",
+   "self_type" : "type-1098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1167",
+   "self_type" : "type-1168",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1236",
+   "self_type" : "type-1237",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1316",
+   "self_type" : "type-1317",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-553",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-810",
+   "self_type" : "type-812",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-1050",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13569,8 +13621,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-654",
-   "self_type" : "type-655",
+   "referenced_type" : "type-669",
+   "self_type" : "type-670",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13578,8 +13630,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-161",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13587,8 +13639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-567",
+   "referenced_type" : "type-132",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13596,8 +13648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13605,8 +13657,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-1361",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13614,8 +13666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-522",
+   "self_type" : "type-523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13623,8 +13675,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-284",
+   "referenced_type" : "type-284",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13632,8 +13684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-629",
+   "referenced_type" : "type-279",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13641,8 +13693,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-1362",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13650,8 +13702,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-630",
-   "self_type" : "type-631",
+   "referenced_type" : "type-642",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13659,8 +13711,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-991",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1013",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13668,8 +13720,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-637",
-   "self_type" : "type-638",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13677,8 +13729,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-553",
+   "referenced_type" : "type-563",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13686,8 +13738,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-293",
+   "referenced_type" : "type-297",
+   "self_type" : "type-298",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13695,8 +13747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-414",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
    "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"
   },
@@ -13704,8 +13756,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-383",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13713,8 +13765,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "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"
   },
@@ -13722,8 +13774,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "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"
   },
@@ -13731,8 +13783,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "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"
   },
@@ -13740,8 +13792,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-990",
-   "self_type" : "type-989",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13749,8 +13801,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-570",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "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"
   },
@@ -13758,8 +13810,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -13767,8 +13819,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "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"
   },
@@ -13776,8 +13828,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -13785,8 +13837,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -13794,8 +13846,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "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"
   },
@@ -13803,8 +13855,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "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"
   },
@@ -13812,15 +13864,6 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
-   "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-530",
    "self_type" : "type-531",
    "size" : 8,
@@ -13828,10 +13871,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
+   "name" : "const android::sp<android::hardware::ProcessState> *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-614",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13839,8 +13891,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13848,8 +13900,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-915",
-   "self_type" : "type-950",
+   "referenced_type" : "type-935",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13857,8 +13909,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-492",
-   "self_type" : "type-509",
+   "referenced_type" : "type-504",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13866,8 +13918,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-483",
-   "self_type" : "type-513",
+   "referenced_type" : "type-494",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13875,8 +13927,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-223",
-   "self_type" : "type-597",
+   "referenced_type" : "type-230",
+   "self_type" : "type-608",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13884,8 +13936,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-60",
-   "self_type" : "type-604",
+   "referenced_type" : "type-67",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13893,8 +13945,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-30",
-   "self_type" : "type-599",
+   "referenced_type" : "type-37",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13902,8 +13954,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-67",
-   "self_type" : "type-608",
+   "referenced_type" : "type-74",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13911,8 +13963,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-41",
-   "self_type" : "type-602",
+   "referenced_type" : "type-48",
+   "self_type" : "type-613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13920,8 +13972,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-504",
+   "referenced_type" : "type-511",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13929,8 +13981,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13938,8 +13990,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-486",
-   "self_type" : "type-487",
+   "referenced_type" : "type-497",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13947,8 +13999,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13956,8 +14008,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13965,8 +14017,8 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-162",
-   "self_type" : "type-988",
+   "referenced_type" : "type-158",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13974,8 +14026,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-348",
+   "referenced_type" : "type-351",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13983,8 +14035,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13992,8 +14044,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-998",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14001,8 +14053,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-301",
+   "self_type" : "type-302",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14010,8 +14062,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-460",
+   "referenced_type" : "type-470",
+   "self_type" : "type-471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -14020,7 +14072,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14028,8 +14080,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-350",
+   "referenced_type" : "type-348",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14038,7 +14090,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14046,8 +14098,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-450",
+   "referenced_type" : "type-103",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -14056,7 +14108,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-12",
-   "self_type" : "type-1008",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14064,8 +14116,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-416",
+   "referenced_type" : "type-22",
+   "self_type" : "type-427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14073,8 +14125,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-416",
-   "self_type" : "type-461",
+   "referenced_type" : "type-427",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -14086,8 +14138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14096,8 +14148,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1173",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14106,8 +14158,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14116,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14126,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14136,8 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14146,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1398",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14156,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14166,18 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1525",
-   "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-1555",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14196,8 +14238,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14206,8 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14216,8 +14258,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14226,8 +14268,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14236,8 +14278,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-668",
-   "self_type" : "type-670",
+   "referenced_type" : "type-629",
+   "self_type" : "type-631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14246,8 +14288,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
+   "referenced_type" : "type-682",
+   "self_type" : "type-684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14256,8 +14298,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-807",
-   "self_type" : "type-810",
+   "referenced_type" : "type-734",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14266,8 +14308,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-881",
-   "self_type" : "type-883",
+   "referenced_type" : "type-828",
+   "self_type" : "type-830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14276,8 +14318,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-902",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14286,8 +14328,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-965",
-   "self_type" : "type-967",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
+   "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-987",
+   "self_type" : "type-989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14296,8 +14348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -14306,8 +14358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14316,8 +14368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-320",
-   "self_type" : "type-326",
+   "referenced_type" : "type-325",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14326,8 +14378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-312",
-   "self_type" : "type-314",
+   "referenced_type" : "type-317",
+   "self_type" : "type-319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14336,8 +14388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-426",
+   "self_type" : "type-428",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14346,8 +14398,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-681",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-696",
+   "self_type" : "type-1043",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14356,8 +14408,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-687",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-702",
+   "self_type" : "type-1045",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14366,8 +14418,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-374",
-   "self_type" : "type-390",
+   "referenced_type" : "type-379",
+   "self_type" : "type-395",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14376,8 +14428,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-245",
-   "self_type" : "type-647",
+   "referenced_type" : "type-252",
+   "self_type" : "type-659",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14386,8 +14438,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<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-239",
-   "self_type" : "type-398",
+   "referenced_type" : "type-246",
+   "self_type" : "type-403",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14396,8 +14448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14406,8 +14458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14416,8 +14468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14426,8 +14478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "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"
   },
@@ -14436,8 +14488,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1201",
    "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"
   },
@@ -14446,8 +14498,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1210",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14456,8 +14508,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "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"
   },
@@ -14466,8 +14518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14476,8 +14528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "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"
   },
@@ -14486,8 +14538,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14496,8 +14548,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14506,8 +14558,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14516,8 +14568,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-953",
-   "self_type" : "type-958",
+   "referenced_type" : "type-976",
+   "self_type" : "type-980",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14526,8 +14578,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-1072",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1097",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14536,8 +14588,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-1143",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1167",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14546,8 +14598,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-1212",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14556,8 +14608,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-1290",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14566,8 +14618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-541",
+   "referenced_type" : "type-151",
+   "self_type" : "type-552",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14576,8 +14628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14587,7 +14639,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-93",
+   "self_type" : "type-90",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14596,8 +14648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14606,8 +14658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14616,8 +14668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14678,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-978",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1068",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14636,8 +14688,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-626",
-   "self_type" : "type-654",
+   "referenced_type" : "type-637",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14646,8 +14698,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-131",
-   "self_type" : "type-161",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14656,8 +14708,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14666,8 +14718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-332",
+   "referenced_type" : "type-20",
+   "self_type" : "type-337",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14676,8 +14728,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-981",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1383",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14686,8 +14738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-510",
+   "referenced_type" : "type-361",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14696,8 +14748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-298",
+   "referenced_type" : "type-273",
+   "self_type" : "type-303",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14706,8 +14758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-279",
+   "referenced_type" : "type-281",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14716,8 +14768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-274",
+   "referenced_type" : "type-141",
+   "self_type" : "type-279",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14726,8 +14778,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-977",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14736,8 +14788,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-636",
+   "self_type" : "type-642",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14746,8 +14798,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-130",
-   "self_type" : "type-991",
+   "referenced_type" : "type-136",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14756,8 +14808,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-632",
-   "self_type" : "type-637",
+   "referenced_type" : "type-644",
+   "self_type" : "type-648",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14766,8 +14818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-550",
+   "referenced_type" : "type-127",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14776,8 +14828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-292",
+   "referenced_type" : "type-295",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14786,8 +14838,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-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-420",
+   "self_type" : "type-424",
    "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"
   },
@@ -14796,8 +14848,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-141",
-   "self_type" : "type-308",
+   "referenced_type" : "type-147",
+   "self_type" : "type-313",
    "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"
   },
@@ -14806,8 +14858,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-24",
-   "self_type" : "type-378",
+   "referenced_type" : "type-31",
+   "self_type" : "type-383",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14816,8 +14868,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-377",
-   "self_type" : "type-392",
+   "referenced_type" : "type-382",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14826,8 +14878,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -14836,8 +14888,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-173",
-   "self_type" : "type-177",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -14846,8 +14898,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-23",
-   "self_type" : "type-574",
+   "referenced_type" : "type-30",
+   "self_type" : "type-585",
    "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"
   },
@@ -14856,8 +14908,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-134",
-   "self_type" : "type-990",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1010",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14866,8 +14918,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-573",
-   "self_type" : "type-578",
+   "referenced_type" : "type-584",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14876,8 +14928,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-96",
-   "self_type" : "type-576",
+   "referenced_type" : "type-102",
+   "self_type" : "type-587",
    "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"
   },
@@ -14886,8 +14938,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-63",
-   "self_type" : "type-568",
+   "referenced_type" : "type-70",
+   "self_type" : "type-580",
    "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"
   },
@@ -14896,8 +14948,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -14906,8 +14958,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-22",
-   "self_type" : "type-583",
+   "referenced_type" : "type-29",
+   "self_type" : "type-595",
    "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"
   },
@@ -14916,8 +14968,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-202",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -14926,8 +14978,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -14936,8 +14988,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-70",
-   "self_type" : "type-571",
+   "referenced_type" : "type-77",
+   "self_type" : "type-582",
    "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"
   },
@@ -14946,8 +14998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-586",
+   "referenced_type" : "type-51",
+   "self_type" : "type-597",
    "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"
   },
@@ -14956,8 +15008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-519",
+   "referenced_type" : "type-439",
+   "self_type" : "type-530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14966,8 +15018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14976,8 +15028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14986,8 +15038,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-609",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14996,8 +15048,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15006,8 +15058,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-916",
-   "self_type" : "type-915",
+   "referenced_type" : "type-936",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15016,8 +15068,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-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15026,8 +15078,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-85",
-   "self_type" : "type-483",
+   "referenced_type" : "type-94",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15036,8 +15088,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15046,26 +15098,6 @@
    "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-61",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 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-20",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 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-68",
    "self_type" : "type-67",
    "size" : 8,
@@ -15074,10 +15106,30 @@
   {
    "alignment" : 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-27",
+   "self_type" : "type-37",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-75",
+   "self_type" : "type-74",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15086,8 +15138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-499",
+   "referenced_type" : "type-384",
+   "self_type" : "type-511",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15095,16 +15147,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "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-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -15112,8 +15164,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-354",
-   "self_type" : "type-490",
+   "referenced_type" : "type-359",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15122,8 +15174,8 @@
    "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-359",
-   "self_type" : "type-486",
+   "referenced_type" : "type-364",
+   "self_type" : "type-497",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15132,8 +15184,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-106",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15142,8 +15194,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15152,8 +15204,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15162,8 +15214,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-72",
-   "self_type" : "type-226",
+   "referenced_type" : "type-63",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15172,8 +15224,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-39",
-   "self_type" : "type-221",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15183,7 +15235,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-162",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15191,80 +15243,72 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1105",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "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-1177",
+   "self_type" : "type-1176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1375",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1487",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1548",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15279,80 +15323,88 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "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-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-813",
-   "self_type" : "type-812",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
+   "referenced_type" : "type-909",
+   "self_type" : "type-908",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-986",
+   "self_type" : "type-985",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15360,8 +15412,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-346",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15370,8 +15422,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15381,7 +15433,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-272",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15390,8 +15442,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-147",
-   "self_type" : "type-146",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15400,8 +15452,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15410,8 +15462,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-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15420,8 +15472,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1080",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15430,8 +15482,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15440,8 +15492,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-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1183",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15450,8 +15502,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-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1255",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15460,8 +15512,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-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15470,8 +15522,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-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15480,8 +15532,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-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15490,8 +15542,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-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15500,8 +15552,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-1474",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15510,8 +15562,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-1538",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15520,8 +15572,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-1562",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15540,8 +15592,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-237",
-   "self_type" : "type-236",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15550,8 +15602,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-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15560,8 +15612,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-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15570,8 +15622,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-642",
-   "self_type" : "type-641",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15580,8 +15632,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-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15590,8 +15642,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15600,8 +15652,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-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-850",
+   "self_type" : "type-849",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15610,8 +15662,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-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15620,8 +15672,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-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15630,8 +15682,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15640,8 +15692,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-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15650,8 +15702,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-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15660,8 +15712,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-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15670,8 +15722,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-1386",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15680,8 +15732,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-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15690,8 +15742,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-1570",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15700,8 +15752,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-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15710,8 +15762,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15720,8 +15772,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-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15730,8 +15782,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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15740,8 +15792,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-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15750,8 +15802,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-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15760,8 +15812,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-1040",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1058",
    "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"
   },
@@ -15770,8 +15822,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-1111",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "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"
   },
@@ -15780,8 +15832,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-1178",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "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"
   },
@@ -15790,8 +15842,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-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "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"
   },
@@ -15800,8 +15852,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-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "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"
   },
@@ -15810,8 +15862,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-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "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"
   },
@@ -15820,8 +15872,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-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "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"
   },
@@ -15830,8 +15882,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-1568",
-   "self_type" : "type-1567",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "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"
   },
@@ -15840,8 +15892,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-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "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"
   },
@@ -15850,8 +15902,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -15860,8 +15912,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-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "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"
   },
@@ -15870,8 +15922,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-694",
-   "self_type" : "type-693",
+   "referenced_type" : "type-716",
+   "self_type" : "type-715",
    "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"
   },
@@ -15880,8 +15932,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "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"
   },
@@ -15890,8 +15942,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-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-919",
+   "self_type" : "type-918",
    "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"
   },
@@ -15900,8 +15952,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-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15910,8 +15962,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-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15920,8 +15972,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-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1186",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15930,8 +15982,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-1236",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15940,8 +15992,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-1289",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15950,8 +16002,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15960,8 +16012,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-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
    "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"
   },
@@ -15970,438 +16022,278 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
-   "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-1545",
-   "self_type" : "type-1544",
-   "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-156",
-   "self_type" : "type-155",
-   "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-402",
-   "self_type" : "type-401",
-   "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-563",
-   "self_type" : "type-562",
-   "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-651",
-   "self_type" : "type-650",
-   "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-833",
-   "self_type" : "type-832",
-   "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-1541",
-   "self_type" : "type-1540",
-   "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-646",
-   "self_type" : "type-645",
-   "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-1282",
-   "self_type" : "type-1281",
-   "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-397",
-   "self_type" : "type-396",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "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-373",
-   "self_type" : "type-372",
-   "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-1093",
-   "self_type" : "type-1092",
-   "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-1161",
-   "self_type" : "type-1160",
-   "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-1230",
-   "self_type" : "type-1229",
-   "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-1307",
-   "self_type" : "type-1306",
-   "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-1359",
-   "self_type" : "type-1358",
-   "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-985",
-   "self_type" : "type-984",
-   "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-1091",
-   "self_type" : "type-1090",
-   "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-1159",
-   "self_type" : "type-1158",
-   "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-1228",
-   "self_type" : "type-1227",
-   "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-1305",
-   "self_type" : "type-1304",
-   "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-1357",
-   "self_type" : "type-1356",
-   "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-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::vector<int, std::allocator<int> >",
-   "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "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-821",
-   "self_type" : "type-820",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1055",
-   "self_type" : "type-1054",
-   "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-1123",
-   "self_type" : "type-1122",
-   "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-1188",
-   "self_type" : "type-1187",
-   "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-1241",
-   "self_type" : "type-1240",
-   "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-1264",
-   "self_type" : "type-1263",
-   "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-1336",
-   "self_type" : "type-1335",
-   "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-1390",
-   "self_type" : "type-1389",
-   "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-1409",
-   "self_type" : "type-1408",
-   "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-1499",
    "self_type" : "type-1498",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-1551",
-   "self_type" : "type-1550",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1566",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-1573",
-   "self_type" : "type-1572",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.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-1589",
-   "self_type" : "type-1588",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-214",
-   "self_type" : "type-213",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.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-258",
-   "self_type" : "type-257",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.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-386",
-   "self_type" : "type-385",
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 16,
    "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-590",
-   "self_type" : "type-589",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1562",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 16,
    "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
    "referenced_type" : "type-658",
    "self_type" : "type-657",
+   "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-1292",
+   "self_type" : "type-1291",
+   "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-402",
+   "self_type" : "type-401",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
+   "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-378",
+   "self_type" : "type-377",
+   "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-1006",
+   "self_type" : "type-1005",
+   "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-1112",
+   "self_type" : "type-1111",
+   "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-1182",
+   "self_type" : "type-1181",
+   "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-1250",
+   "self_type" : "type-1249",
+   "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-1329",
+   "self_type" : "type-1328",
+   "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-1381",
+   "self_type" : "type-1380",
+   "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-1110",
+   "self_type" : "type-1109",
+   "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-1180",
+   "self_type" : "type-1179",
+   "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-1248",
+   "self_type" : "type-1247",
+   "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-1327",
+   "self_type" : "type-1326",
+   "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-1379",
+   "self_type" : "type-1378",
+   "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-996",
+   "self_type" : "type-995",
+   "size" : 16,
+   "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-134",
+   "self_type" : "type-133",
+   "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-843",
+   "self_type" : "type-842",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1073",
+   "self_type" : "type-1072",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16410,8 +16302,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-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16420,8 +16312,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16430,8 +16322,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1253",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16440,8 +16332,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-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "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-1358",
+   "self_type" : "type-1357",
+   "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-1412",
+   "self_type" : "type-1411",
+   "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-1431",
+   "self_type" : "type-1430",
+   "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-1521",
+   "self_type" : "type-1520",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-1601",
+   "self_type" : "type-1600",
+   "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-17",
+   "self_type" : "type-16",
+   "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-221",
+   "self_type" : "type-220",
+   "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-267",
+   "self_type" : "type-266",
+   "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-391",
+   "self_type" : "type-390",
+   "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-602",
+   "self_type" : "type-601",
+   "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-673",
+   "self_type" : "type-672",
+   "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-721",
+   "self_type" : "type-720",
+   "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-785",
+   "self_type" : "type-784",
+   "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-890",
+   "self_type" : "type-889",
+   "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-924",
+   "self_type" : "type-923",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16450,8 +16502,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16471,7 +16523,7 @@
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
    "referenced_type" : "type-12",
-   "self_type" : "type-215",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16480,8 +16532,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16489,8 +16541,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-296",
+   "referenced_type" : "type-22",
+   "self_type" : "type-301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16498,8 +16550,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-480",
+   "referenced_type" : "type-21",
+   "self_type" : "type-493",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -16513,14 +16565,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16532,17 +16584,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-431"
     }
    ],
    "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-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-320", "type-428" ],
+   "template_args" : [ "type-325", "type-439" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16552,17 +16604,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-308",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-302" ],
+   "template_args" : [ "type-307" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -16572,17 +16624,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-418" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16592,14 +16644,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16611,14 +16663,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-477"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16628,7 +16680,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-308"
     }
    ],
    "fields" :
@@ -16637,20 +16689,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16662,14 +16714,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16681,14 +16733,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16700,14 +16752,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16720,14 +16772,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -16767,8 +16819,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -16778,8 +16830,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16789,8 +16841,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16822,8 +16874,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16834,17 +16886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-430"
     }
    ],
    "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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-432" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16891,14 +16943,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16956,14 +17008,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-326"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-325",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16975,14 +17027,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16993,7 +17045,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -17002,25 +17054,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-479"
     },
     {
      "access" : "private",
@@ -17032,19 +17084,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-544"
     },
     {
      "access" : "private",
@@ -17056,8 +17108,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -17147,17 +17199,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -17202,17 +17254,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-436",
+   "self_type" : "type-436",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-357" ],
+   "template_args" : [ "type-362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -17257,17 +17309,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-380" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -17312,17 +17364,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-423" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -17369,7 +17421,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
@@ -17387,14 +17439,14 @@
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -17446,14 +17498,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -17483,23 +17535,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-697"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-698"
     }
    ],
    "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-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-404" ],
+   "template_args" : [ "type-364", "type-419" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -17509,23 +17561,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-703"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-704"
     }
    ],
    "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-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-16" ],
+   "template_args" : [ "type-364", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -17535,23 +17587,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-380"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-381"
     }
    ],
    "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-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-377", "type-379" ],
+   "template_args" : [ "type-382", "type-384" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -17561,23 +17613,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -17587,23 +17639,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -17644,18 +17696,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-281"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -17737,14 +17789,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -17756,13 +17808,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -17779,11 +17831,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -17791,7 +17843,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17800,17 +17852,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -17818,7 +17870,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17827,17 +17879,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -17845,7 +17897,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17854,17 +17906,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -17872,63 +17924,9 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "field_offset" : 320,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "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-1072",
-   "self_type" : "type-1072",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVal",
-     "field_offset" : 320,
      "referenced_type" : "type-20"
     }
    ],
-   "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-1143",
-   "self_type" : "type-1143",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-15"
-    }
-   ],
    "fields" :
    [
     {
@@ -17938,22 +17936,22 @@
      "referenced_type" : "type-68"
     }
    ],
-   "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> >",
+   "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-1212",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1093",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17962,17 +17960,71 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-27"
+    }
+   ],
+   "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-1162",
+   "self_type" : "type-1162",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-27" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-20"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-75"
+    }
+   ],
+   "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-1232",
+   "self_type" : "type-1232",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-75" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-20"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-49"
     }
    ],
    "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-1290",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1312",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -17980,7 +18032,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17989,17 +18041,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -18007,17 +18059,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -18056,34 +18108,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-707",
+   "self_type" : "type-707",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-696" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-710",
+   "self_type" : "type-710",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-702" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-409",
+   "self_type" : "type-409",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-379" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-664",
+   "self_type" : "type-664",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-413",
+   "self_type" : "type-413",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -18122,8 +18274,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -18135,14 +18287,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -18151,8 +18303,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -18161,8 +18313,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -18171,8 +18323,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -18208,7 +18360,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -18219,8 +18371,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -18249,16 +18401,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-1000"
     }
    ],
    "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-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-981" ],
+   "template_args" : [ "type-1002" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -18267,16 +18419,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-638"
     }
    ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -18285,16 +18437,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -18303,16 +18455,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-995"
+     "referenced_type" : "type-1016"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1015",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -18322,7 +18474,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
@@ -18333,8 +18485,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -18345,16 +18497,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -18364,7 +18516,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -18375,8 +18527,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -18387,16 +18539,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -18406,7 +18558,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -18417,8 +18569,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -18430,7 +18582,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-1001"
     },
     {
      "field_name" : "_pad",
@@ -18441,8 +18593,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -18454,7 +18606,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-639"
     },
     {
      "field_name" : "_pad",
@@ -18465,8 +18617,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -18477,13 +18629,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -18496,7 +18648,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -18507,8 +18659,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -18519,13 +18671,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -18538,7 +18690,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -18549,8 +18701,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -18559,8 +18711,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -18578,14 +18730,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -18594,11 +18746,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-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1018",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLm32EJEEE"
   },
   {
@@ -18608,16 +18760,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-982"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLm32EJEEE"
   },
   {
@@ -18625,7 +18777,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-365"
     }
    ],
    "fields" :
@@ -18634,7 +18786,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -18646,13 +18798,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 256,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -18732,13 +18884,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -18820,19 +18972,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -18844,7 +18996,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -18856,13 +19008,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -18874,7 +19026,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -18886,13 +19038,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -18916,13 +19068,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -18935,7 +19087,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-999"
     },
     {
      "access" : "private",
@@ -18947,16 +19099,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-977",
-   "self_type" : "type-977",
+   "referenced_type" : "type-998",
+   "self_type" : "type-998",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-981" ],
+   "template_args" : [ "type-1002" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -18966,7 +19118,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-637"
     },
     {
      "access" : "private",
@@ -18978,16 +19130,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -18997,7 +19149,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -19009,16 +19161,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -19028,7 +19180,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-994"
+     "referenced_type" : "type-1015"
     },
     {
      "access" : "private",
@@ -19040,16 +19192,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1014",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -19057,7 +19209,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-645"
     }
    ],
    "fields" :
@@ -19065,14 +19217,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-641"
     }
    ],
    "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-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -19084,7 +19236,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -19096,13 +19248,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -19115,19 +19267,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -19137,10 +19289,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19149,13 +19301,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -19277,10 +19429,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-423"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19289,19 +19441,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-422"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -19484,10 +19636,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19496,19 +19648,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "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",
@@ -19644,13 +19796,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "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"
@@ -19661,13 +19813,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "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",
@@ -19776,7 +19928,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19785,13 +19937,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -19913,7 +20065,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19922,13 +20074,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -20050,10 +20202,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20062,19 +20214,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -20281,10 +20433,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20293,19 +20445,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -20491,10 +20643,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20503,19 +20655,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-921",
-   "self_type" : "type-921",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "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",
@@ -20664,10 +20816,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20676,19 +20828,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "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",
@@ -20816,13 +20968,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -20964,12 +21116,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -20979,18 +21131,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -21000,13 +21152,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -21119,7 +21271,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21128,13 +21280,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -21256,10 +21408,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21268,19 +21420,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -21490,10 +21642,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21502,19 +21654,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "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",
@@ -21666,13 +21818,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -21817,7 +21969,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21826,13 +21978,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -21954,7 +22106,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21963,13 +22115,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -22091,10 +22243,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22103,19 +22255,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -22301,10 +22453,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22313,19 +22465,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -22550,10 +22702,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22562,19 +22714,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1219",
    "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",
@@ -22702,10 +22854,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22714,19 +22866,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1295",
    "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",
@@ -22893,13 +23045,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -23012,13 +23164,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -23185,17 +23337,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-545"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-534" ],
+   "template_args" : [ "type-546" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -23205,17 +23357,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-503" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -23225,17 +23377,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-930"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-950",
+   "self_type" : "type-950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-929" ],
+   "template_args" : [ "type-951" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -23245,17 +23397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-440"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-431" ],
+   "template_args" : [ "type-442" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -23265,17 +23417,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-956"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-934",
-   "self_type" : "type-934",
+   "referenced_type" : "type-955",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-937" ],
+   "template_args" : [ "type-958" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -23285,17 +23437,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -23305,17 +23457,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -23325,17 +23477,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-617"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-610" ],
+   "template_args" : [ "type-622" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -23345,17 +23497,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-81" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -23365,17 +23517,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
    "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-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-936",
+   "self_type" : "type-936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-358" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -23385,17 +23537,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -23405,17 +23557,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
    "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-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -23425,17 +23577,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
    "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-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-188",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
+   "template_args" : [ "type-30" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -23445,57 +23597,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-69"
     }
    ],
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
+   "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-68",
    "self_type" : "type-68",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
+   "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-75",
+   "self_type" : "type-75",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -23505,69 +23657,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23577,52 +23729,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23632,19 +23784,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23654,74 +23806,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-550",
+   "self_type" : "type-550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23731,52 +23883,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23786,19 +23938,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23808,74 +23960,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23885,52 +24037,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23940,19 +24092,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-732",
+   "self_type" : "type-732",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23962,96 +24114,96 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-320" ],
+   "template_args" : [ "type-325" ],
    "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-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-317" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-562",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-63" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -24061,52 +24213,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-714" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-192" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-147" ],
+   "template_args" : [ "type-149" ],
    "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-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -24116,19 +24268,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-711" ],
+   "template_args" : [ "type-731" ],
    "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-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -24138,22 +24290,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -24163,23 +24315,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -24189,23 +24341,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-930"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-913" ],
+   "template_args" : [ "type-933" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -24215,23 +24367,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -24241,23 +24393,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -24266,18 +24418,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -24293,18 +24445,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-466"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -24315,7 +24467,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-462"
     },
     {
      "field_name" : "num_planes",
@@ -24325,13 +24477,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-453"
+     "referenced_type" : "type-464"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -24342,12 +24494,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-461"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bits_per_component",
@@ -24382,8 +24534,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -24394,38 +24546,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -24436,18 +24588,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -24458,17 +24610,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "ystride",
@@ -24488,13 +24640,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -24504,13 +24656,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -24521,35 +24673,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-350"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-345"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-344"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-342"
     }
    ],
    "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-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "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)"
@@ -24570,8 +24722,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -24582,12 +24734,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24612,13 +24764,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-342",
+   "self_type" : "type-342",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -24629,12 +24781,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24664,13 +24816,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -24681,12 +24833,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24716,13 +24868,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -24733,12 +24885,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24773,13 +24925,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -24823,8 +24975,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24832,8 +24984,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24841,8 +24993,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-953",
-   "self_type" : "type-956",
+   "referenced_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24850,8 +25002,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-1072",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24859,8 +25011,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-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1165",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24868,8 +25020,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-1212",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24877,8 +25029,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-1290",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24886,8 +25038,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-283",
+   "referenced_type" : "type-151",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24895,8 +25047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-394",
+   "referenced_type" : "type-19",
+   "self_type" : "type-399",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24905,7 +25057,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-706",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24913,8 +25065,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-686",
+   "referenced_type" : "type-419",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -24922,8 +25074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-324",
+   "referenced_type" : "type-20",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24931,8 +25083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-268",
-   "self_type" : "type-278",
+   "referenced_type" : "type-273",
+   "self_type" : "type-283",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24940,8 +25092,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-276",
-   "self_type" : "type-282",
+   "referenced_type" : "type-281",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24949,8 +25101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24958,8 +25110,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-502",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24967,8 +25119,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-428",
-   "self_type" : "type-515",
+   "referenced_type" : "type-439",
+   "self_type" : "type-527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24976,8 +25128,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-916",
-   "self_type" : "type-948",
+   "referenced_type" : "type-936",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24985,8 +25137,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-507",
+   "referenced_type" : "type-505",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24994,8 +25146,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-85",
-   "self_type" : "type-592",
+   "referenced_type" : "type-94",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25003,8 +25155,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-181",
-   "self_type" : "type-941",
+   "referenced_type" : "type-188",
+   "self_type" : "type-962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25012,8 +25164,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-61",
-   "self_type" : "type-945",
+   "referenced_type" : "type-68",
+   "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25021,8 +25173,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25030,8 +25182,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-68",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25039,8 +25191,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25048,8 +25200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-379",
-   "self_type" : "type-389",
+   "referenced_type" : "type-384",
+   "self_type" : "type-394",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25057,8 +25209,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-359",
-   "self_type" : "type-685",
+   "referenced_type" : "type-364",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25066,8 +25218,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-377",
-   "self_type" : "type-388",
+   "referenced_type" : "type-382",
+   "self_type" : "type-393",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25075,8 +25227,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-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25084,8 +25236,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-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25093,8 +25245,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-1171",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25102,8 +25254,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-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1262",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25111,8 +25263,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-1324",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25120,8 +25272,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-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25129,8 +25281,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25138,8 +25290,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25147,8 +25299,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25156,8 +25308,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25165,8 +25317,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25174,8 +25326,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25183,8 +25335,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25192,8 +25344,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25201,8 +25353,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25210,8 +25362,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25219,8 +25371,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25228,8 +25380,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/Q/64/x86_x86_64/source-based/libhidltransport.so.lsdump b/Q/64/x86_x86_64/source-based/libhidltransport.so.lsdump
index 190a3b0..86475c0 100644
--- a/Q/64/x86_x86_64/source-based/libhidltransport.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libhidltransport.so.lsdump
@@ -5,15 +5,24 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-140",
-   "self_type" : "type-338",
+   "referenced_type" : "type-146",
+   "self_type" : "type-343",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-146",
+   "self_type" : "type-410",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-38",
-   "self_type" : "type-455",
+   "referenced_type" : "type-25",
+   "self_type" : "type-466",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -28,8 +37,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-983",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1004",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -37,8 +46,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-97",
-   "self_type" : "type-345",
+   "referenced_type" : "type-103",
+   "self_type" : "type-350",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-11",
-   "self_type" : "type-447",
+   "self_type" : "type-458",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -60,8 +69,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1
   },
   {
@@ -69,8 +78,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -79,24 +88,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-145",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 2
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 1
   },
   {
@@ -150,8 +159,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1
   },
   {
@@ -170,8 +179,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 4
   },
   {
@@ -190,15 +199,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
+   "referenced_type" : "type-22",
+   "self_type" : "type-22"
   }
  ],
  "elf_functions" :
@@ -1788,10 +1797,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE7destroyEPNS_11__tree_nodeISC_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
@@ -1800,10 +1805,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE7destroyEPNS_11__tree_nodeIS9_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
@@ -1840,10 +1841,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE7destroyEPNS_11__tree_nodeISJ_SG_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE12__find_equalIS7_EERPNS_16__tree_node_baseISE_EERPNS_15__tree_end_nodeISR_EERKT_"
   },
   {
@@ -1856,14 +1853,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE7destroyEPNS_11__tree_nodeISH_SE_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
@@ -2651,8 +2640,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-11",
@@ -2669,8 +2658,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-11",
@@ -2687,8 +2676,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-11",
@@ -2713,8 +2702,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2743,8 +2732,8 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -2765,8 +2754,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-11",
@@ -2819,8 +2808,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2862,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-11",
@@ -2899,8 +2888,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "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-2",
@@ -2917,8 +2906,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-584",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/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-2",
@@ -2943,11 +2932,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "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-97",
+   "underlying_type" : "type-103",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -2993,8 +2982,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3047,8 +3036,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3073,8 +3062,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3115,8 +3104,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3357,8 +3346,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3387,8 +3376,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3417,8 +3406,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3459,8 +3448,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3497,8 +3486,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-11",
@@ -3523,8 +3512,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3541,8 +3530,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3571,8 +3560,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-11",
@@ -3665,8 +3654,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-443",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3707,8 +3696,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-449",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3725,8 +3714,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-11",
@@ -3755,8 +3744,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-11",
@@ -3789,8 +3778,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-11",
@@ -3843,8 +3832,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-11",
@@ -3860,12 +3849,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     }
    ],
-   "referenced_type" : "type-459",
+   "referenced_type" : "type-470",
    "return_type" : "type-2",
-   "self_type" : "type-459",
+   "self_type" : "type-470",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
@@ -3878,10 +3867,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3891,10 +3880,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -3904,16 +3893,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3923,13 +3912,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1614"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3939,13 +3928,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1615"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3955,13 +3944,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -3971,13 +3960,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1616"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -3987,13 +3976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1617"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4003,10 +3992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4016,10 +4005,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4029,10 +4018,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4042,16 +4031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4060,14 +4049,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -4078,13 +4067,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1620"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4094,13 +4083,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4110,13 +4099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1366"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4125,16 +4114,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1623"
     }
    ],
    "return_type" : "type-2",
@@ -4147,16 +4136,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
      "default_arg" : true,
@@ -4164,7 +4153,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1624"
     }
    ],
    "return_type" : "type-2",
@@ -4176,16 +4165,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1625"
     }
    ],
    "return_type" : "type-2",
@@ -4199,13 +4188,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1626"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4214,16 +4203,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1627"
     }
    ],
    "return_type" : "type-2",
@@ -4235,16 +4224,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1628"
     }
    ],
    "return_type" : "type-2",
@@ -4256,16 +4245,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1629"
     }
    ],
    "return_type" : "type-2",
@@ -4277,16 +4266,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1630"
     }
    ],
    "return_type" : "type-2",
@@ -4298,16 +4287,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1394"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1395"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1631"
     }
    ],
    "return_type" : "type-2",
@@ -4321,10 +4310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4334,13 +4323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4350,19 +4339,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4372,13 +4361,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4388,19 +4377,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1391"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4410,10 +4399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4423,10 +4412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4436,10 +4425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4448,13 +4437,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4463,19 +4452,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4485,16 +4474,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4504,13 +4493,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1632"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4520,13 +4509,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1633"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4536,13 +4525,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -4552,13 +4541,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1634"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4567,16 +4556,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1635"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4585,16 +4574,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1636"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4604,13 +4593,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1637"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4619,16 +4608,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1638"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4638,10 +4627,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4651,10 +4640,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4663,16 +4652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1639"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4681,13 +4670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4696,13 +4685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1369"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4712,10 +4701,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4725,16 +4714,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -4744,13 +4733,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4760,13 +4749,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-950"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -4776,14 +4765,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4793,16 +4782,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4812,13 +4801,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1640"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4828,13 +4817,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4844,14 +4833,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4861,13 +4850,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4877,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4893,11 +4882,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     }
    ],
    "return_type" : "type-2",
@@ -4910,13 +4899,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4926,10 +4915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4939,10 +4928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4951,13 +4940,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4967,10 +4956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4980,16 +4969,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -4998,14 +4987,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5014,14 +5003,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5032,13 +5021,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1646"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5048,13 +5037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5064,13 +5053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-925"
+     "referenced_type" : "type-948"
     },
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5079,16 +5068,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1652"
     }
    ],
    "return_type" : "type-2",
@@ -5101,16 +5090,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "default_arg" : true,
@@ -5118,7 +5107,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1653"
     }
    ],
    "return_type" : "type-2",
@@ -5132,13 +5121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5147,16 +5136,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1655"
     }
    ],
    "return_type" : "type-2",
@@ -5168,16 +5157,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1656"
     }
    ],
    "return_type" : "type-2",
@@ -5189,16 +5178,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1657"
     }
    ],
    "return_type" : "type-2",
@@ -5210,16 +5199,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1635"
+     "referenced_type" : "type-1658"
     }
    ],
    "return_type" : "type-2",
@@ -5231,16 +5220,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-1659"
     }
    ],
    "return_type" : "type-2",
@@ -5254,10 +5243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5266,16 +5255,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1637"
+     "referenced_type" : "type-1660"
     }
    ],
    "return_type" : "type-2",
@@ -5287,16 +5276,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1661"
     }
    ],
    "return_type" : "type-2",
@@ -5309,13 +5298,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5325,13 +5314,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5341,10 +5330,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5354,10 +5343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5367,10 +5356,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5379,16 +5368,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1639"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5398,16 +5387,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5417,13 +5406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5433,13 +5422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5449,16 +5438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5468,13 +5457,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5484,13 +5473,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5499,16 +5488,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5518,16 +5507,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5536,19 +5525,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -5558,13 +5547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5573,19 +5562,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5595,10 +5584,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5608,10 +5597,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5621,19 +5610,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5643,16 +5632,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5661,22 +5650,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5685,19 +5674,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5707,16 +5696,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5726,16 +5715,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5745,13 +5734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5761,10 +5750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5774,16 +5763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5792,19 +5781,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5813,19 +5802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -5835,13 +5824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5851,13 +5840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5867,13 +5856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-926"
+     "referenced_type" : "type-949"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -5883,14 +5872,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5900,16 +5889,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5919,13 +5908,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5935,13 +5924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -5951,14 +5940,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-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/IServiceNotification.h"
   },
   {
@@ -5968,13 +5957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -5984,13 +5973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1651"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6000,11 +5989,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     }
    ],
    "return_type" : "type-2",
@@ -6017,13 +6006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6033,10 +6022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6046,10 +6035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6058,13 +6047,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6074,10 +6063,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6087,16 +6076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-69"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6105,14 +6094,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6121,14 +6110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "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"
   },
   {
@@ -6139,13 +6128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6155,13 +6144,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6171,13 +6160,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1084"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6186,10 +6175,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1036"
     },
     {
      "referenced_type" : "type-11"
@@ -6207,10 +6196,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1066"
     },
     {
-     "referenced_type" : "type-1008"
+     "referenced_type" : "type-1032"
     },
     {
      "referenced_type" : "type-11"
@@ -6229,16 +6218,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
      "default_arg" : true,
@@ -6246,7 +6235,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1681"
     }
    ],
    "return_type" : "type-2",
@@ -6260,13 +6249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6275,16 +6264,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1118"
+     "referenced_type" : "type-1137"
     },
     {
-     "referenced_type" : "type-1119"
+     "referenced_type" : "type-1138"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1683"
     }
    ],
    "return_type" : "type-2",
@@ -6298,10 +6287,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6311,13 +6300,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6327,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6343,10 +6332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6356,10 +6345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6369,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-180"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6382,16 +6371,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6401,13 +6390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6417,13 +6406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6433,13 +6422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6449,13 +6438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6465,19 +6454,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6487,13 +6476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6502,22 +6491,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6527,10 +6516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6540,10 +6529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6553,10 +6542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6566,16 +6555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6585,13 +6574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6601,13 +6590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6617,14 +6606,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6634,16 +6623,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6653,13 +6642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6669,13 +6658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6685,14 +6674,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "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"
   },
   {
@@ -6702,13 +6691,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -6718,13 +6707,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6734,11 +6723,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     }
    ],
    "return_type" : "type-2",
@@ -6751,13 +6740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6767,10 +6756,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6780,10 +6769,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6792,13 +6781,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -6808,10 +6797,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6821,16 +6810,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6839,14 +6828,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6855,14 +6844,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6871,14 +6860,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "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"
   },
   {
@@ -6889,13 +6878,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6905,13 +6894,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6921,13 +6910,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-1153"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -6937,16 +6926,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
      "default_arg" : true,
@@ -6954,7 +6943,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1700"
     }
    ],
    "return_type" : "type-2",
@@ -6968,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -6983,16 +6972,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1204"
     },
     {
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-1205"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1702"
     }
    ],
    "return_type" : "type-2",
@@ -7006,10 +6995,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7019,13 +7008,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7035,13 +7024,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7051,10 +7040,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7064,10 +7053,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7077,10 +7066,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-199"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7090,16 +7079,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7109,13 +7098,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7125,13 +7114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7141,16 +7130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -7160,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7176,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7192,16 +7181,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7211,13 +7200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7227,10 +7216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7240,10 +7229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7253,19 +7242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7275,16 +7264,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7294,19 +7283,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7315,22 +7304,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1139"
+     "referenced_type" : "type-1158"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7340,16 +7329,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7359,16 +7348,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -7378,13 +7367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7394,10 +7383,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7407,16 +7396,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7426,13 +7415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1709"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7442,13 +7431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7458,13 +7447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1136"
+     "referenced_type" : "type-1154"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -7474,14 +7463,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7491,16 +7480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7510,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1710"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7526,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1711"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7542,14 +7531,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "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"
   },
   {
@@ -7559,13 +7548,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7575,13 +7564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7591,11 +7580,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     }
    ],
    "return_type" : "type-2",
@@ -7608,13 +7597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1713"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7624,10 +7613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7637,10 +7626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7649,13 +7638,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7665,10 +7654,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7678,16 +7667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7696,14 +7685,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7712,14 +7701,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "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"
   },
   {
@@ -7729,14 +7718,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7746,16 +7735,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7765,13 +7754,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1714"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7781,13 +7770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1715"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7797,14 +7786,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "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"
   },
   {
@@ -7814,13 +7803,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -7830,13 +7819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7846,11 +7835,11 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     }
    ],
    "return_type" : "type-2",
@@ -7863,13 +7852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-1694"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7879,10 +7868,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7892,10 +7881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7904,13 +7893,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "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"
   },
   {
@@ -7920,10 +7909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7933,16 +7922,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -7951,14 +7940,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7967,14 +7956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-229"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7983,14 +7972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -7999,14 +7988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "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"
   },
   {
@@ -8017,13 +8006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-1697"
+     "referenced_type" : "type-1720"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8033,13 +8022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8049,13 +8038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1198"
+     "referenced_type" : "type-1221"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8066,13 +8055,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-1725"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8082,13 +8071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8098,13 +8087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8114,16 +8103,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
      "default_arg" : true,
@@ -8131,7 +8120,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1732"
     }
    ],
    "return_type" : "type-2",
@@ -8145,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8160,16 +8149,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1281"
     },
     {
-     "referenced_type" : "type-1259"
+     "referenced_type" : "type-1282"
     },
     {
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-1734"
     }
    ],
    "return_type" : "type-2",
@@ -8183,10 +8172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8196,13 +8185,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8212,13 +8201,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8228,10 +8217,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8241,10 +8230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8254,10 +8243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-208"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8267,16 +8256,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
      "default_arg" : true,
@@ -8284,7 +8273,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-1735"
     }
    ],
    "return_type" : "type-2",
@@ -8298,13 +8287,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8313,16 +8302,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1714"
+     "referenced_type" : "type-1737"
     }
    ],
    "return_type" : "type-2",
@@ -8334,16 +8323,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1715"
+     "referenced_type" : "type-1738"
     }
    ],
    "return_type" : "type-2",
@@ -8355,16 +8344,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1716"
+     "referenced_type" : "type-1739"
     }
    ],
    "return_type" : "type-2",
@@ -8376,16 +8365,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1717"
+     "referenced_type" : "type-1740"
     }
    ],
    "return_type" : "type-2",
@@ -8397,16 +8386,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-338"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1337"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1338"
     },
     {
-     "referenced_type" : "type-1718"
+     "referenced_type" : "type-1741"
     }
    ],
    "return_type" : "type-2",
@@ -8420,10 +8409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8433,13 +8422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8449,13 +8438,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-47"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8465,10 +8454,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8478,10 +8467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8491,10 +8480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-216"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8504,16 +8493,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8523,13 +8512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8539,13 +8528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8555,13 +8544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8571,13 +8560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1721"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8586,19 +8575,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8608,13 +8597,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-1722"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8624,10 +8613,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8637,10 +8626,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8650,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8663,16 +8652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8682,16 +8671,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8701,13 +8690,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8717,13 +8706,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1222"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -8733,16 +8722,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8752,19 +8741,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8774,13 +8763,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1723"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8790,13 +8779,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1747"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8806,16 +8795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-95",
+   "return_type" : "type-101",
    "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"
   },
   {
@@ -8825,19 +8814,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8847,13 +8836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8863,13 +8852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1725"
+     "referenced_type" : "type-1748"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8879,16 +8868,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1726"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8897,22 +8886,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8921,22 +8910,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -8946,13 +8935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-1750"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8962,10 +8951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8975,10 +8964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -8988,22 +8977,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9013,16 +9002,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-1751"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9032,19 +9021,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9054,16 +9043,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9073,16 +9062,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9092,19 +9081,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-66"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9113,25 +9102,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9140,19 +9129,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9161,19 +9150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1302"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9183,16 +9172,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "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"
   },
   {
@@ -9202,16 +9191,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     }
    ],
-   "return_type" : "type-84",
+   "return_type" : "type-93",
    "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"
   },
   {
@@ -9221,13 +9210,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9237,10 +9226,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9250,16 +9239,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1034"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9269,13 +9258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-1731"
+     "referenced_type" : "type-1754"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-19",
    "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"
   },
   {
@@ -9285,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9301,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "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"
   },
   {
@@ -9316,12 +9305,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-24", "type-406", "type-153" ]
+   "template_args" : [ "type-31", "type-420", "type-160" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9329,12 +9318,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-63", "type-173", "type-171" ]
+   "template_args" : [ "type-70", "type-181", "type-179" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9342,12 +9331,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-72", "type-203", "type-200" ]
+   "template_args" : [ "type-77", "type-209", "type-207" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -9355,12 +9344,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-706"
+     "referenced_type" : "type-728"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-44", "type-45", "type-152" ]
+   "template_args" : [ "type-51", "type-52", "type-159" ]
   },
   {
    "function_name" : "android::hardware::writeToParcel",
@@ -9368,10 +9357,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-375"
     }
    ],
    "return_type" : "type-2",
@@ -9383,10 +9372,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-561"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     }
    ],
    "return_type" : "type-2",
@@ -9398,10 +9387,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-537"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
    "return_type" : "type-2",
@@ -9413,10 +9402,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-291",
+   "return_type" : "type-296",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9425,13 +9414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9446,19 +9435,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9467,10 +9456,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-377"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9498,14 +9487,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-576"
     }
    ],
    "return_type" : "type-2",
@@ -9518,10 +9507,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -9531,16 +9520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9549,7 +9538,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
      "referenced_type" : "type-2"
@@ -9558,7 +9547,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-21",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9573,10 +9562,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9594,10 +9583,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9615,10 +9604,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-373"
     },
     {
      "referenced_type" : "type-11"
@@ -9639,10 +9628,10 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -9651,10 +9640,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9672,10 +9661,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9693,10 +9682,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-280"
     },
     {
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-372"
     },
     {
      "referenced_type" : "type-11"
@@ -9714,28 +9703,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-428",
+   "return_type" : "type-439",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9745,13 +9734,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-369"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9761,10 +9750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     }
    ],
-   "return_type" : "type-354",
+   "return_type" : "type-359",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9774,19 +9763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9796,19 +9785,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-366"
     },
     {
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-506"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -9820,22 +9809,22 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -9844,18 +9833,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-954",
+   "return_type" : "type-977",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-23", "type-24", "type-184" ]
+   "template_args" : [ "type-30", "type-31", "type-192" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9863,18 +9852,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1073",
+   "return_type" : "type-1094",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-63", "type-24", "type-173" ]
+   "template_args" : [ "type-70", "type-31", "type-181" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9882,18 +9871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-24", "type-194" ]
+   "template_args" : [ "type-29", "type-31", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9901,18 +9890,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1144",
+   "return_type" : "type-1163",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-22", "type-23", "type-194" ]
+   "template_args" : [ "type-29", "type-30", "type-200" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9920,18 +9909,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1213",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-72", "type-24", "type-203" ]
+   "template_args" : [ "type-77", "type-31", "type-209" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9939,18 +9928,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-24", "type-45" ]
+   "template_args" : [ "type-51", "type-31", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9958,18 +9947,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-23", "type-45" ]
+   "template_args" : [ "type-51", "type-30", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -9977,18 +9966,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-1291",
+   "return_type" : "type-1313",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-44", "type-22", "type-45" ]
+   "template_args" : [ "type-51", "type-29", "type-52" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -9996,10 +9985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     }
    ],
-   "return_type" : "type-749",
+   "return_type" : "type-764",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10008,12 +9997,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-24", "type-17" ]
+   "template_args" : [ "type-31", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10021,12 +10010,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-63", "type-17" ]
+   "template_args" : [ "type-70", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -10034,12 +10023,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-72", "type-17" ]
+   "template_args" : [ "type-77", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::canCastInterface",
@@ -10047,17 +10036,17 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-148",
+   "return_type" : "type-151",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -10072,13 +10061,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10087,18 +10076,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1041"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-181",
+   "return_type" : "type-188",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-184", "type-23", "type-17", "type-17" ]
+   "template_args" : [ "type-192", "type-30", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10106,18 +10095,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-68",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-173", "type-63", "type-17", "type-17" ]
+   "template_args" : [ "type-181", "type-70", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10125,18 +10114,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-27",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-194", "type-22", "type-17", "type-17" ]
+   "template_args" : [ "type-200", "type-29", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10144,18 +10133,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1261"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-70",
+   "return_type" : "type-75",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-72", "type-17", "type-17" ]
+   "template_args" : [ "type-209", "type-77", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -10163,29 +10152,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-49",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-45", "type-44", "type-17", "type-17" ]
+   "template_args" : [ "type-52", "type-51", "type-22", "type-22" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-238",
+   "return_type" : "type-245",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-244",
+   "return_type" : "type-251",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -10194,19 +10183,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10215,10 +10204,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-85",
+   "return_type" : "type-94",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -10227,10 +10216,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-22",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10239,10 +10228,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-164"
     }
    ],
    "return_type" : "type-2",
@@ -10254,79 +10243,79 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-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/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-144",
    "source_file" : "/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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-138",
+   "referenced_type" : "type-144",
    "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-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-170",
+   "referenced_type" : "type-169",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-764",
+   "referenced_type" : "type-779",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-765",
+   "referenced_type" : "type-780",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-374",
+   "referenced_type" : "type-409",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   }
  ],
@@ -10336,8 +10325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-466",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10345,8 +10334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-476",
+   "referenced_type" : "type-483",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10354,8 +10343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-329",
+   "referenced_type" : "type-325",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10363,17 +10352,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-317",
+   "referenced_type" : "type-317",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.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-697",
+   "self_type" : "type-709",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-703",
+   "self_type" : "type-712",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-252",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10381,8 +10388,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-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -10390,8 +10397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10399,8 +10406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10408,8 +10415,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-95",
-   "self_type" : "type-100",
+   "referenced_type" : "type-101",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10417,8 +10424,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-84",
-   "self_type" : "type-89",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10426,8 +10433,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-954",
-   "self_type" : "type-958",
+   "referenced_type" : "type-977",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10435,8 +10442,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-1073",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10444,8 +10451,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-1144",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10453,8 +10460,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-1213",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10462,8 +10469,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-1291",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10471,8 +10478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-294",
+   "referenced_type" : "type-151",
+   "self_type" : "type-299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10480,8 +10487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-14",
-   "self_type" : "type-400",
+   "referenced_type" : "type-19",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10498,8 +10505,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-979",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10507,8 +10514,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-626",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-637",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10516,8 +10523,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-131",
-   "self_type" : "type-160",
+   "referenced_type" : "type-137",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10525,8 +10532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-107",
-   "self_type" : "type-115",
+   "referenced_type" : "type-114",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10534,8 +10541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10543,8 +10550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-281",
+   "referenced_type" : "type-281",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10552,8 +10559,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10561,8 +10568,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-978",
-   "self_type" : "type-988",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1008",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10570,8 +10577,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-625",
-   "self_type" : "type-977",
+   "referenced_type" : "type-636",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10579,8 +10586,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-632",
-   "self_type" : "type-636",
+   "referenced_type" : "type-644",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10588,8 +10595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-127",
+   "self_type" : "type-130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10597,8 +10604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-169",
+   "referenced_type" : "type-140",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10606,8 +10613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-428",
-   "self_type" : "type-518",
+   "referenced_type" : "type-439",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10615,8 +10622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-77",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10624,8 +10631,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-917",
-   "self_type" : "type-950",
+   "referenced_type" : "type-937",
+   "self_type" : "type-972",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10633,8 +10640,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-85",
-   "self_type" : "type-661",
+   "referenced_type" : "type-94",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10642,8 +10649,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-181",
-   "self_type" : "type-943",
+   "referenced_type" : "type-188",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10651,8 +10658,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-61",
-   "self_type" : "type-945",
+   "referenced_type" : "type-68",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10660,8 +10667,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-20",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10669,8 +10676,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-70",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10678,8 +10685,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-42",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10687,8 +10694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-379",
-   "self_type" : "type-501",
+   "referenced_type" : "type-384",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10696,8 +10703,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-359",
-   "self_type" : "type-485",
+   "referenced_type" : "type-364",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10705,8 +10712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
+   "referenced_type" : "type-331",
+   "self_type" : "type-333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10714,8 +10721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-316",
+   "referenced_type" : "type-319",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10723,8 +10730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10732,8 +10739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1137",
    "size" : 4,
    "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"
   },
@@ -10741,8 +10748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1204",
    "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"
   },
@@ -10750,8 +10757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10759,8 +10766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1281",
    "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"
   },
@@ -10768,8 +10775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10777,8 +10784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "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"
   },
@@ -10786,8 +10793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10795,8 +10802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-961",
+   "referenced_type" : "type-552",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10804,8 +10811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-13",
-   "self_type" : "type-18",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10813,8 +10820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-92",
-   "self_type" : "type-551",
+   "referenced_type" : "type-90",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10822,8 +10829,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10831,8 +10838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10840,8 +10847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-298",
-   "self_type" : "type-299",
+   "referenced_type" : "type-303",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10849,8 +10856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-279",
-   "self_type" : "type-280",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10858,8 +10865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-279",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10867,8 +10874,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-1363",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10876,8 +10883,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-630",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-642",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10885,8 +10892,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-992",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -10894,8 +10901,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-637",
-   "self_type" : "type-639",
+   "referenced_type" : "type-648",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10903,8 +10910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-550",
-   "self_type" : "type-554",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10912,8 +10919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-292",
-   "self_type" : "type-295",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10921,8 +10928,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-392",
-   "self_type" : "type-393",
+   "referenced_type" : "type-397",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10930,8 +10937,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-991",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10939,8 +10946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-519",
-   "self_type" : "type-706",
+   "referenced_type" : "type-530",
+   "self_type" : "type-728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10948,8 +10955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-36",
+   "referenced_type" : "type-39",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10957,8 +10964,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-916",
-   "self_type" : "type-919",
+   "referenced_type" : "type-936",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10966,8 +10973,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-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10975,8 +10982,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-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10984,8 +10991,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-223",
-   "self_type" : "type-222",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10993,8 +11000,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-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11002,8 +11009,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-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11011,8 +11018,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-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11020,8 +11027,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-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11029,8 +11036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-499",
-   "self_type" : "type-500",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11038,8 +11045,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11047,8 +11054,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-362",
-   "self_type" : "type-364",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -11056,8 +11063,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-490",
-   "self_type" : "type-491",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11065,8 +11072,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-486",
-   "self_type" : "type-702",
+   "referenced_type" : "type-497",
+   "self_type" : "type-724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11074,8 +11081,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-105",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11083,8 +11090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-226",
-   "self_type" : "type-227",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11092,8 +11099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-225",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11101,79 +11108,72 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-164",
+   "referenced_type" : "type-158",
+   "self_type" : "type-165",
    "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-1087",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1108",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1179",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1247",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1490",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1529",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1551",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11186,79 +11186,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-233",
-   "self_type" : "type-235",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-238",
+   "self_type" : "type-240",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-547",
-   "self_type" : "type-549",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-621",
-   "self_type" : "type-624",
+   "referenced_type" : "type-558",
+   "self_type" : "type-560",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-672",
-   "self_type" : "type-674",
+   "referenced_type" : "type-633",
+   "self_type" : "type-635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-813",
-   "self_type" : "type-816",
+   "referenced_type" : "type-739",
+   "self_type" : "type-741",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-835",
+   "self_type" : "type-837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-987",
+   "referenced_type" : "type-909",
+   "self_type" : "type-911",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-973",
+   "referenced_type" : "type-986",
+   "self_type" : "type-991",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-992",
+   "self_type" : "type-994",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-351",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11266,8 +11273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-202",
+   "referenced_type" : "type-177",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11275,8 +11282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-148",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11284,8 +11291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-110",
-   "self_type" : "type-118",
+   "referenced_type" : "type-111",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11293,8 +11300,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-1015",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11302,8 +11309,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-1098",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1120",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11311,8 +11318,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-1168",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11320,8 +11327,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-1236",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11329,8 +11336,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-1289",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11338,8 +11345,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-1319",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -11347,8 +11354,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-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1391",
    "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"
   },
@@ -11356,197 +11363,125 @@
    "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-1477",
-   "self_type" : "type-1479",
-   "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-1545",
-   "self_type" : "type-1547",
-   "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-155",
-   "self_type" : "type-157",
-   "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-401",
-   "self_type" : "type-403",
-   "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-562",
-   "self_type" : "type-564",
-   "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-650",
-   "self_type" : "type-652",
-   "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-833",
-   "self_type" : "type-835",
-   "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-1541",
-   "self_type" : "type-1540",
-   "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-645",
-   "self_type" : "type-644",
-   "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-1280",
-   "self_type" : "type-1279",
-   "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-396",
-   "self_type" : "type-395",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
-   "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
-   "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-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1055",
-   "self_type" : "type-1054",
-   "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-1123",
-   "self_type" : "type-1122",
-   "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-1188",
-   "self_type" : "type-1187",
-   "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-1241",
-   "self_type" : "type-1240",
-   "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-1264",
-   "self_type" : "type-1263",
-   "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-1336",
-   "self_type" : "type-1335",
-   "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-1390",
-   "self_type" : "type-1389",
-   "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-1409",
-   "self_type" : "type-1408",
-   "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-1499",
-   "self_type" : "type-1498",
+   "self_type" : "type-1501",
+   "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-1567",
+   "self_type" : "type-1569",
+   "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-162",
+   "self_type" : "type-164",
+   "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-406",
+   "self_type" : "type-408",
+   "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-573",
+   "self_type" : "type-576",
+   "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-661",
+   "self_type" : "type-663",
+   "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-855",
+   "self_type" : "type-857",
+   "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-1563",
+   "self_type" : "type-1562",
+   "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-657",
+   "self_type" : "type-656",
+   "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-1290",
+   "self_type" : "type-1289",
+   "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-401",
+   "self_type" : "type-400",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
+   "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-843",
+   "self_type" : "type-845",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1074",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11554,8 +11489,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-1551",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11563,8 +11498,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-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11572,8 +11507,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-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11581,8 +11516,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-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11590,8 +11525,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11599,8 +11534,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-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11608,8 +11543,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-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11617,8 +11552,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-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1520",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11626,8 +11561,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-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11635,8 +11570,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-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11644,8 +11579,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-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11653,8 +11588,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
+   "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-266",
+   "self_type" : "type-265",
+   "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-390",
+   "self_type" : "type-389",
+   "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-601",
+   "self_type" : "type-600",
+   "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-673",
+   "self_type" : "type-672",
+   "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-721",
+   "self_type" : "type-720",
+   "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-785",
+   "self_type" : "type-784",
+   "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-890",
+   "self_type" : "type-889",
+   "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-924",
+   "self_type" : "type-923",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11662,8 +11669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-143",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11671,8 +11678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-177",
+   "referenced_type" : "type-169",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11680,8 +11687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-204",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11689,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-150",
-   "self_type" : "type-158",
+   "referenced_type" : "type-155",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11699,7 +11706,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-309",
+   "self_type" : "type-314",
    "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"
   },
@@ -11707,8 +11714,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-577",
+   "referenced_type" : "type-103",
+   "self_type" : "type-588",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   }
@@ -11719,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-471",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -11728,8 +11735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-464",
+   "referenced_type" : "type-473",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11737,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-467",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11746,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-474",
+   "referenced_type" : "type-483",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11755,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-477",
+   "referenced_type" : "type-486",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11764,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11773,8 +11780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-261",
+   "referenced_type" : "type-32",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11782,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11791,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11800,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11809,8 +11816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11818,8 +11825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11827,8 +11834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11836,8 +11843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11845,8 +11852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11854,17 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11881,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11890,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11899,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11908,8 +11906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11917,8 +11915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11926,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11935,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-809",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11944,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11953,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11962,8 +11960,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11971,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-363",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11980,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11989,8 +11996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -11998,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-320",
-   "self_type" : "type-330",
+   "referenced_type" : "type-325",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12007,8 +12014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-312",
-   "self_type" : "type-318",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12016,8 +12023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12025,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-494",
+   "referenced_type" : "type-418",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -12034,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12043,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12052,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12061,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12070,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12079,8 +12086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12088,8 +12095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12097,8 +12104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "type-386",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12106,8 +12113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12115,8 +12122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-801",
+   "self_type" : "type-800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12124,8 +12131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12133,8 +12140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12142,8 +12149,8 @@
    "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-682",
-   "self_type" : "type-685",
+   "referenced_type" : "type-697",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12151,8 +12158,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-688",
-   "self_type" : "type-692",
+   "referenced_type" : "type-703",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12160,8 +12167,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-374",
-   "self_type" : "type-387",
+   "referenced_type" : "type-379",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12169,8 +12176,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-245",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-252",
+   "self_type" : "type-666",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12178,8 +12185,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-239",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-246",
+   "self_type" : "type-414",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12196,8 +12203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12205,8 +12212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12214,8 +12221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12223,8 +12230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12232,8 +12239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12241,8 +12248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12250,8 +12257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12259,8 +12266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12268,8 +12275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12277,8 +12284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12286,8 +12293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-225",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12295,8 +12302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12304,8 +12311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12313,8 +12320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12322,8 +12329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12331,8 +12338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-705",
-   "self_type" : "type-704",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12340,8 +12347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12349,8 +12356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12358,8 +12365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12367,8 +12374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12376,8 +12383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12385,8 +12392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12394,8 +12401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12403,8 +12410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12412,8 +12419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12421,8 +12428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12430,8 +12437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12439,8 +12446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12448,8 +12455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12457,8 +12464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12466,8 +12473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12475,8 +12482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-561",
+   "referenced_type" : "type-570",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -12484,8 +12491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12493,8 +12500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 4,
    "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"
   },
@@ -12502,26 +12509,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
-   "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-1206",
    "self_type" : "type-1205",
    "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-1215",
+   "self_type" : "type-1214",
+   "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-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "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"
   },
@@ -12529,8 +12536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12538,8 +12545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "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"
   },
@@ -12547,8 +12554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12556,8 +12563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12565,8 +12572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12574,8 +12581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12583,8 +12590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12592,8 +12599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12601,8 +12608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12610,8 +12617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12619,8 +12626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12628,8 +12635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12637,8 +12644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12646,8 +12653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12655,8 +12662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12664,8 +12671,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-95",
-   "self_type" : "type-98",
+   "referenced_type" : "type-101",
+   "self_type" : "type-104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12673,8 +12680,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-84",
-   "self_type" : "type-87",
+   "referenced_type" : "type-93",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12682,8 +12689,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-954",
-   "self_type" : "type-956",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12691,8 +12698,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-1073",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12700,8 +12707,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-1144",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12709,8 +12716,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-1213",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12718,8 +12725,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-1291",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12727,8 +12734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-273",
+   "referenced_type" : "type-151",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12736,8 +12743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-383",
+   "referenced_type" : "type-19",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12746,7 +12753,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-5",
-   "self_type" : "type-537",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12754,8 +12761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12763,17 +12770,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-708",
+   "self_type" : "type-710",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-711",
+   "self_type" : "type-713",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-409",
+   "self_type" : "type-411",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-665",
+   "self_type" : "type-667",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-413",
+   "self_type" : "type-415",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-405",
+   "referenced_type" : "type-56",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12781,375 +12833,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
-   "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-784",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-979",
-   "self_type" : "type-1049",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-626",
-   "self_type" : "type-1044",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-131",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
-   "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-982",
-   "self_type" : "type-981",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
-   "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_string *",
-   "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-978",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-625",
-   "self_type" : "type-974",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-130",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "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-632",
-   "self_type" : "type-635",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<int> *",
-   "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
-   "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-333",
-   "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::hidl::base::V1_0::BpHwBase *",
-   "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-928",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
-   "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1344",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
-   "size" : 4,
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
-   "size" : 4,
-   "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::hidl::manager::V1_0::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-944",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1062",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-182",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
-   "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::hidl::manager::V1_1::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-1136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
-   "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
-   "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::hidl::manager::V1_2::BnHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-209",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-1199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1198",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1276",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
-   "name" : "android::hidl::manager::V1_2::IClientCallback *",
    "referenced_type" : "type-72",
    "self_type" : "type-71",
    "size" : 4,
@@ -13157,10 +12840,379 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-1000",
+   "self_type" : "type-1067",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-637",
+   "self_type" : "type-1063",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-137",
+   "self_type" : "type-166",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
+   "name" : "android::hardware::details::hidl_pointer<int> *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-20",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "name" : "android::hardware::hidl_array<unsigned char, 32> *",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1002",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_string *",
+   "name" : "android::hardware::hidl_string *",
+   "referenced_type" : "type-141",
+   "self_type" : "type-639",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-999",
+   "self_type" : "type-1005",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-636",
+   "self_type" : "type-995",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-136",
+   "self_type" : "type-150",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-644",
+   "self_type" : "type-646",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<int> *",
+   "name" : "android::hardware::hidl_vec<int> *",
+   "referenced_type" : "type-127",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-296",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
+   "name" : "android::hidl::base::V1_0::BnHwBase *",
+   "referenced_type" : "type-160",
+   "self_type" : "type-338",
+   "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::hidl::base::V1_0::BpHwBase *",
+   "name" : "android::hidl::base::V1_0::BpHwBase *",
+   "referenced_type" : "type-420",
+   "self_type" : "type-950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
+   "name" : "android::hidl::base::V1_0::BsBase *",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1366",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-95",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
+   "size" : 4,
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
+   "size" : 4,
+   "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::hidl::manager::V1_0::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
+   "referenced_type" : "type-192",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
+   "referenced_type" : "type-181",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_0::BsServiceManager *",
+   "referenced_type" : "type-944",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-189",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "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::hidl::manager::V1_1::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_1::BsServiceManager *",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
+   "name" : "android::hidl::manager::V1_1::IServiceManager *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
+   "referenced_type" : "type-207",
+   "self_type" : "type-208",
+   "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::hidl::manager::V1_2::BnHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
+   "referenced_type" : "type-159",
+   "self_type" : "type-216",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
+   "referenced_type" : "type-209",
+   "self_type" : "type-1222",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "name" : "android::hidl::manager::V1_2::BsClientCallback *",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "name" : "android::hidl::manager::V1_2::BsServiceManager *",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
+   "name" : "android::hidl::manager::V1_2::IClientCallback *",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13168,8 +13220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13177,8 +13229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-951",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13186,8 +13238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-514",
+   "referenced_type" : "type-439",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13195,8 +13247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-73",
+   "referenced_type" : "type-40",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13204,8 +13256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-529",
+   "referenced_type" : "type-536",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13213,8 +13265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13222,339 +13274,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-917",
-   "self_type" : "type-948",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-85",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-181",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-61",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-20",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-70",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-42",
-   "self_type" : "type-601",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
-   "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-498",
-   "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-910",
-   "self_type" : "type-915",
-   "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-354",
-   "self_type" : "type-489",
-   "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-359",
-   "self_type" : "type-482",
-   "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-449",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-301",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-327",
-   "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-314",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-418",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1022",
-   "self_type" : "type-1023",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-390",
-   "self_type" : "type-391",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-647",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "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-398",
-   "self_type" : "type-399",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1452",
-   "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-521",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-101",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-90",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-959",
-   "self_type" : "type-960",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1077",
-   "self_type" : "type-1078",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1148",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1219",
-   "self_type" : "type-1220",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "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-1296",
-   "self_type" : "type-1297",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::details::Waiter *",
-   "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-791",
-   "self_type" : "type-793",
-   "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-80",
    "self_type" : "type-82",
    "size" : 4,
@@ -13562,10 +13281,343 @@
   },
   {
    "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-937",
+   "self_type" : "type-970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-505",
+   "self_type" : "type-517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-94",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-188",
+   "self_type" : "type-607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-68",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-27",
+   "self_type" : "type-610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-75",
+   "self_type" : "type-616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-49",
+   "self_type" : "type-612",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
+   "name" : "android::wp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-509",
+   "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-930",
+   "self_type" : "type-935",
+   "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-359",
+   "self_type" : "type-501",
+   "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-364",
+   "self_type" : "type-490",
+   "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-460",
+   "self_type" : "type-464",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-146",
+   "self_type" : "type-356",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-331",
+   "self_type" : "type-332",
+   "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-319",
+   "self_type" : "type-320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.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-1044",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-395",
+   "self_type" : "type-396",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-659",
+   "self_type" : "type-660",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-403",
+   "self_type" : "type-404",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1474",
+   "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-533",
+   "self_type" : "type-535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.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-108",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-99",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-981",
+   "self_type" : "type-982",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1098",
+   "self_type" : "type-1099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1168",
+   "self_type" : "type-1169",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1237",
+   "self_type" : "type-1238",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-1317",
+   "self_type" : "type-1318",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-553",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-811",
+   "self_type" : "type-813",
+   "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-86",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13573,8 +13625,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-654",
-   "self_type" : "type-655",
+   "referenced_type" : "type-669",
+   "self_type" : "type-670",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13582,8 +13634,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-162",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13591,8 +13643,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-567",
+   "referenced_type" : "type-132",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13600,8 +13652,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13609,8 +13661,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-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13618,8 +13670,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
+   "referenced_type" : "type-522",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13627,8 +13679,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-284",
+   "referenced_type" : "type-284",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13636,8 +13688,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-629",
+   "referenced_type" : "type-279",
+   "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13645,8 +13697,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-1363",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13654,8 +13706,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-630",
-   "self_type" : "type-631",
+   "referenced_type" : "type-642",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13663,8 +13715,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-992",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13672,8 +13724,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-637",
-   "self_type" : "type-638",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13681,8 +13733,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-553",
+   "referenced_type" : "type-563",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13690,8 +13742,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-293",
+   "referenced_type" : "type-297",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13699,8 +13751,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-414",
+   "referenced_type" : "type-424",
+   "self_type" : "type-425",
    "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"
   },
@@ -13708,8 +13760,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-383",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13769,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "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"
   },
@@ -13726,8 +13778,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "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"
   },
@@ -13735,8 +13787,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13744,8 +13796,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-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13753,8 +13805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-570",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "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"
   },
@@ -13762,8 +13814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-205",
+   "self_type" : "type-206",
    "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"
   },
@@ -13771,8 +13823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "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"
   },
@@ -13780,8 +13832,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-215",
    "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"
   },
@@ -13789,8 +13841,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
+   "referenced_type" : "type-217",
+   "self_type" : "type-218",
    "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"
   },
@@ -13798,8 +13850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "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"
   },
@@ -13807,8 +13859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "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"
   },
@@ -13816,15 +13868,6 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-520",
-   "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-530",
    "self_type" : "type-531",
    "size" : 4,
@@ -13832,10 +13875,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
+   "name" : "const android::sp<android::hardware::ProcessState> *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-614",
+   "referenced_type" : "type-624",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13843,8 +13895,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13852,8 +13904,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-916",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13861,8 +13913,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-492",
-   "self_type" : "type-509",
+   "referenced_type" : "type-504",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13870,8 +13922,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-483",
-   "self_type" : "type-513",
+   "referenced_type" : "type-494",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13879,8 +13931,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-223",
-   "self_type" : "type-597",
+   "referenced_type" : "type-230",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13888,8 +13940,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-60",
-   "self_type" : "type-604",
+   "referenced_type" : "type-67",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13897,8 +13949,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-30",
-   "self_type" : "type-599",
+   "referenced_type" : "type-37",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13906,8 +13958,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-69",
-   "self_type" : "type-608",
+   "referenced_type" : "type-74",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13915,8 +13967,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-41",
-   "self_type" : "type-602",
+   "referenced_type" : "type-48",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13924,8 +13976,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-504",
+   "referenced_type" : "type-511",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13933,8 +13985,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13942,8 +13994,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-486",
-   "self_type" : "type-487",
+   "referenced_type" : "type-497",
+   "self_type" : "type-498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13951,8 +14003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13960,8 +14012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14021,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-989",
+   "referenced_type" : "type-158",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13978,8 +14030,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-348",
+   "referenced_type" : "type-351",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13987,8 +14039,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13996,8 +14048,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-999",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14005,8 +14057,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-297",
+   "referenced_type" : "type-301",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14014,8 +14066,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-460",
+   "referenced_type" : "type-470",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -14024,7 +14076,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-109",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14032,8 +14084,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-350",
+   "referenced_type" : "type-348",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14042,7 +14094,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-1",
-   "self_type" : "type-266",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14050,8 +14102,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-450",
+   "referenced_type" : "type-103",
+   "self_type" : "type-461",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -14060,7 +14112,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-11",
-   "self_type" : "type-1010",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14068,8 +14120,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-416",
+   "referenced_type" : "type-22",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14077,8 +14129,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-416",
-   "self_type" : "type-461",
+   "referenced_type" : "type-427",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -14090,8 +14142,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14100,8 +14152,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14110,8 +14162,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14120,8 +14172,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14130,8 +14182,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14140,8 +14192,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14150,8 +14202,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14160,8 +14212,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14170,18 +14222,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14200,8 +14242,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-228",
-   "self_type" : "type-231",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14210,8 +14252,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-235",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14220,8 +14262,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14230,8 +14272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +14282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-669",
-   "self_type" : "type-671",
+   "referenced_type" : "type-629",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14250,8 +14292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
+   "referenced_type" : "type-683",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14260,8 +14302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-809",
-   "self_type" : "type-811",
+   "referenced_type" : "type-735",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-882",
-   "self_type" : "type-884",
+   "referenced_type" : "type-829",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14280,8 +14322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-903",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14290,8 +14332,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-966",
-   "self_type" : "type-968",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +14352,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -14310,8 +14362,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-25",
-   "self_type" : "type-250",
+   "referenced_type" : "type-32",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14320,8 +14372,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-320",
-   "self_type" : "type-326",
+   "referenced_type" : "type-325",
+   "self_type" : "type-331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14330,8 +14382,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-312",
-   "self_type" : "type-314",
+   "referenced_type" : "type-317",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14340,8 +14392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-426",
+   "self_type" : "type-428",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -14350,8 +14402,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-682",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-697",
+   "self_type" : "type-1044",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14360,8 +14412,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-688",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-703",
+   "self_type" : "type-1046",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14370,8 +14422,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-374",
-   "self_type" : "type-390",
+   "referenced_type" : "type-379",
+   "self_type" : "type-395",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14380,8 +14432,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-245",
-   "self_type" : "type-647",
+   "referenced_type" : "type-252",
+   "self_type" : "type-659",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14390,8 +14442,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<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-239",
-   "self_type" : "type-398",
+   "referenced_type" : "type-246",
+   "self_type" : "type-403",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14400,8 +14452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1472",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14420,8 +14472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14430,8 +14482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -14440,8 +14492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "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"
   },
@@ -14450,8 +14502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1211",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14460,8 +14512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "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"
   },
@@ -14470,8 +14522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14480,8 +14532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "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"
   },
@@ -14490,8 +14542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -14500,8 +14552,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-95",
-   "self_type" : "type-101",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14510,8 +14562,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-84",
-   "self_type" : "type-90",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14520,8 +14572,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-954",
-   "self_type" : "type-959",
+   "referenced_type" : "type-977",
+   "self_type" : "type-981",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14530,8 +14582,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-1073",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1098",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14540,8 +14592,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-1144",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1168",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14550,8 +14602,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-1213",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14560,8 +14612,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-1291",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1317",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14570,8 +14622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-541",
+   "referenced_type" : "type-151",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14580,8 +14632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14591,7 +14643,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-5",
-   "self_type" : "type-92",
+   "self_type" : "type-90",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14600,8 +14652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1043",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14610,8 +14662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14620,8 +14672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14682,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-979",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14640,8 +14692,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-626",
-   "self_type" : "type-654",
+   "referenced_type" : "type-637",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14650,8 +14702,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-131",
-   "self_type" : "type-162",
+   "referenced_type" : "type-137",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14660,8 +14712,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-107",
-   "self_type" : "type-125",
+   "referenced_type" : "type-114",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14670,8 +14722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-15",
-   "self_type" : "type-332",
+   "referenced_type" : "type-20",
+   "self_type" : "type-337",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14680,8 +14732,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-982",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1384",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14690,8 +14742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-510",
+   "referenced_type" : "type-361",
+   "self_type" : "type-522",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14700,8 +14752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-298",
+   "referenced_type" : "type-273",
+   "self_type" : "type-303",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14710,8 +14762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-279",
+   "referenced_type" : "type-281",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14720,8 +14772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-274",
+   "referenced_type" : "type-141",
+   "self_type" : "type-279",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14730,8 +14782,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-978",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14740,8 +14792,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-625",
-   "self_type" : "type-630",
+   "referenced_type" : "type-636",
+   "self_type" : "type-642",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14750,8 +14802,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-130",
-   "self_type" : "type-992",
+   "referenced_type" : "type-136",
+   "self_type" : "type-1013",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14760,8 +14812,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-632",
-   "self_type" : "type-637",
+   "referenced_type" : "type-644",
+   "self_type" : "type-648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14770,8 +14822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-550",
+   "referenced_type" : "type-127",
+   "self_type" : "type-563",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14780,8 +14832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-292",
+   "referenced_type" : "type-295",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14790,8 +14842,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-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-420",
+   "self_type" : "type-424",
    "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"
   },
@@ -14800,8 +14852,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-141",
-   "self_type" : "type-308",
+   "referenced_type" : "type-147",
+   "self_type" : "type-313",
    "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"
   },
@@ -14810,8 +14862,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-24",
-   "self_type" : "type-378",
+   "referenced_type" : "type-31",
+   "self_type" : "type-383",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14820,8 +14872,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-377",
-   "self_type" : "type-392",
+   "referenced_type" : "type-382",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14830,8 +14882,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-184",
-   "self_type" : "type-188",
+   "referenced_type" : "type-192",
+   "self_type" : "type-196",
    "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"
   },
@@ -14840,8 +14892,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-173",
-   "self_type" : "type-178",
+   "referenced_type" : "type-181",
+   "self_type" : "type-185",
    "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"
   },
@@ -14850,8 +14902,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-23",
-   "self_type" : "type-574",
+   "referenced_type" : "type-30",
+   "self_type" : "type-585",
    "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"
   },
@@ -14860,8 +14912,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-134",
-   "self_type" : "type-991",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1012",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14870,8 +14922,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-573",
-   "self_type" : "type-578",
+   "referenced_type" : "type-584",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14880,8 +14932,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-96",
-   "self_type" : "type-576",
+   "referenced_type" : "type-102",
+   "self_type" : "type-587",
    "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"
   },
@@ -14890,8 +14942,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-63",
-   "self_type" : "type-568",
+   "referenced_type" : "type-70",
+   "self_type" : "type-580",
    "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"
   },
@@ -14900,8 +14952,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-194",
-   "self_type" : "type-198",
+   "referenced_type" : "type-200",
+   "self_type" : "type-205",
    "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"
   },
@@ -14910,8 +14962,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-22",
-   "self_type" : "type-583",
+   "referenced_type" : "type-29",
+   "self_type" : "type-595",
    "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"
   },
@@ -14920,8 +14972,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-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-209",
+   "self_type" : "type-214",
    "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"
   },
@@ -14930,8 +14982,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-45",
-   "self_type" : "type-210",
+   "referenced_type" : "type-52",
+   "self_type" : "type-217",
    "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"
   },
@@ -14940,8 +14992,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-72",
-   "self_type" : "type-571",
+   "referenced_type" : "type-77",
+   "self_type" : "type-582",
    "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"
   },
@@ -14950,8 +15002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-586",
+   "referenced_type" : "type-51",
+   "self_type" : "type-597",
    "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"
   },
@@ -14960,8 +15012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-519",
+   "referenced_type" : "type-439",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14970,8 +15022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14980,8 +15032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-530",
+   "referenced_type" : "type-536",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15042,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-609",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15000,8 +15052,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-74",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-84",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15010,8 +15062,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-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15020,8 +15072,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-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15030,8 +15082,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-85",
-   "self_type" : "type-483",
+   "referenced_type" : "type-94",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15040,8 +15092,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-181",
-   "self_type" : "type-223",
+   "referenced_type" : "type-188",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15050,8 +15102,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-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15060,8 +15112,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-20",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15070,8 +15122,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-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15132,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +15142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-499",
+   "referenced_type" : "type-384",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,16 +15151,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1200",
    "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-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -15116,8 +15168,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-354",
-   "self_type" : "type-490",
+   "referenced_type" : "type-359",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15126,8 +15178,8 @@
    "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-359",
-   "self_type" : "type-486",
+   "referenced_type" : "type-364",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15136,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-104",
+   "referenced_type" : "type-21",
+   "self_type" : "type-105",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15146,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15156,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15166,8 +15218,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-67",
-   "self_type" : "type-226",
+   "referenced_type" : "type-62",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15176,8 +15228,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-38",
-   "self_type" : "type-219",
+   "referenced_type" : "type-25",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15187,7 +15239,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-2",
-   "self_type" : "type-161",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15195,80 +15247,72 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1488",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1527",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1549",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15283,80 +15327,88 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-239",
+   "self_type" : "type-238",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -15364,8 +15416,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-346",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15374,8 +15426,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15385,7 +15437,7 @@
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
    "referenced_type" : "type-1",
-   "self_type" : "type-272",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15394,8 +15446,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-148",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15404,8 +15456,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15414,8 +15466,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-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15424,8 +15476,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-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15434,8 +15486,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-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15444,8 +15496,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-1166",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15454,8 +15506,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-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15464,8 +15516,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15474,8 +15526,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-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15484,8 +15536,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-1405",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15494,8 +15546,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-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15504,8 +15556,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-147",
-   "self_type" : "type-146",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15514,8 +15566,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-1539",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15524,8 +15576,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-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15544,8 +15596,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-237",
-   "self_type" : "type-236",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15554,8 +15606,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-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15564,8 +15616,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-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15574,8 +15626,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-642",
-   "self_type" : "type-641",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15584,8 +15636,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-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15594,8 +15646,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15604,8 +15656,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-830",
-   "self_type" : "type-829",
+   "referenced_type" : "type-851",
+   "self_type" : "type-850",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15614,8 +15666,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-893",
-   "self_type" : "type-892",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -15624,8 +15676,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-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15634,8 +15686,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-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15644,8 +15696,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-1181",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15654,8 +15706,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-1254",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15664,8 +15716,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15674,8 +15726,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-1387",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15684,8 +15736,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-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15694,8 +15746,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-1571",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15704,8 +15756,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-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15714,8 +15766,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-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15724,8 +15776,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-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15734,8 +15786,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-697",
-   "self_type" : "type-696",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15744,8 +15796,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-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15754,8 +15806,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-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -15764,8 +15816,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-1041",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "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"
   },
@@ -15774,8 +15826,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-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "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"
   },
@@ -15784,8 +15836,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-1179",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "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"
   },
@@ -15794,8 +15846,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-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "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"
   },
@@ -15804,8 +15856,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-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "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"
   },
@@ -15814,8 +15866,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-1385",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "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"
   },
@@ -15824,8 +15876,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-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1513",
+   "self_type" : "type-1512",
    "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"
   },
@@ -15834,8 +15886,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-1569",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "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"
   },
@@ -15844,8 +15896,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-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "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"
   },
@@ -15854,8 +15906,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-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "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"
   },
@@ -15864,8 +15916,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-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "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"
   },
@@ -15874,8 +15926,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-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-716",
+   "self_type" : "type-715",
    "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"
   },
@@ -15884,8 +15936,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-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "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"
   },
@@ -15894,8 +15946,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-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
    "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"
   },
@@ -15904,8 +15956,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-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1038",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15914,8 +15966,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-1099",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15924,8 +15976,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-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1187",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15934,8 +15986,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-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1259",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15944,8 +15996,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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15954,8 +16006,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-1320",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -15964,8 +16016,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-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
    "size" : 12,
    "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"
   },
@@ -15974,368 +16026,278 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
-   "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-1546",
-   "self_type" : "type-1545",
-   "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-156",
-   "self_type" : "type-155",
-   "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-402",
-   "self_type" : "type-401",
-   "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-563",
-   "self_type" : "type-562",
-   "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-651",
-   "self_type" : "type-650",
-   "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-834",
-   "self_type" : "type-833",
-   "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-1542",
-   "self_type" : "type-1541",
-   "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-646",
-   "self_type" : "type-645",
-   "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-1281",
-   "self_type" : "type-1280",
-   "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-397",
-   "self_type" : "type-396",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "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-373",
-   "self_type" : "type-372",
-   "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-1094",
-   "self_type" : "type-1093",
-   "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-1162",
-   "self_type" : "type-1161",
-   "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-1231",
-   "self_type" : "type-1230",
-   "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-1308",
-   "self_type" : "type-1307",
-   "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-1360",
-   "self_type" : "type-1359",
-   "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-986",
-   "self_type" : "type-985",
-   "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-1092",
-   "self_type" : "type-1091",
-   "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-1160",
-   "self_type" : "type-1159",
-   "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-1229",
-   "self_type" : "type-1228",
-   "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-1306",
-   "self_type" : "type-1305",
-   "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-1358",
-   "self_type" : "type-1357",
-   "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-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::vector<int, std::allocator<int> >",
-   "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "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-822",
-   "self_type" : "type-821",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1056",
-   "self_type" : "type-1055",
-   "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-1124",
-   "self_type" : "type-1123",
-   "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-1189",
-   "self_type" : "type-1188",
-   "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-1242",
-   "self_type" : "type-1241",
-   "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-1265",
-   "self_type" : "type-1264",
-   "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-1337",
-   "self_type" : "type-1336",
-   "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-1391",
-   "self_type" : "type-1390",
-   "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-1410",
-   "self_type" : "type-1409",
-   "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-1500",
    "self_type" : "type-1499",
    "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-163",
+   "self_type" : "type-162",
+   "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-407",
+   "self_type" : "type-406",
+   "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-574",
+   "self_type" : "type-573",
+   "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-662",
+   "self_type" : "type-661",
+   "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-856",
+   "self_type" : "type-855",
+   "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-1564",
+   "self_type" : "type-1563",
+   "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-658",
+   "self_type" : "type-657",
+   "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-1291",
+   "self_type" : "type-1290",
+   "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-402",
+   "self_type" : "type-401",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
+   "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-378",
+   "self_type" : "type-377",
+   "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-1007",
+   "self_type" : "type-1006",
+   "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-1113",
+   "self_type" : "type-1112",
+   "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-1183",
+   "self_type" : "type-1182",
+   "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-1251",
+   "self_type" : "type-1250",
+   "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-1330",
+   "self_type" : "type-1329",
+   "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-1382",
+   "self_type" : "type-1381",
+   "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-1111",
+   "self_type" : "type-1110",
+   "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-1181",
+   "self_type" : "type-1180",
+   "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-1249",
+   "self_type" : "type-1248",
+   "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-1328",
+   "self_type" : "type-1327",
+   "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-1380",
+   "self_type" : "type-1379",
+   "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-997",
+   "self_type" : "type-996",
+   "size" : 8,
+   "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-134",
+   "self_type" : "type-133",
+   "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-844",
+   "self_type" : "type-843",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.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-1552",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16344,8 +16306,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-1574",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16354,8 +16316,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-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1209",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16364,8 +16326,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-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16374,8 +16336,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16384,8 +16346,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-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16394,8 +16356,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-590",
-   "self_type" : "type-589",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16404,8 +16366,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16414,8 +16376,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-700",
-   "self_type" : "type-699",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16424,8 +16386,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16434,8 +16396,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-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16444,8 +16406,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
+   "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-221",
+   "self_type" : "type-220",
+   "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-267",
+   "self_type" : "type-266",
+   "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-391",
+   "self_type" : "type-390",
+   "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-602",
+   "self_type" : "type-601",
+   "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-674",
+   "self_type" : "type-673",
+   "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-722",
+   "self_type" : "type-721",
+   "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-786",
+   "self_type" : "type-785",
+   "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-891",
+   "self_type" : "type-890",
+   "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-925",
+   "self_type" : "type-924",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +16506,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-97",
-   "self_type" : "type-129",
+   "referenced_type" : "type-103",
+   "self_type" : "type-122",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16465,7 +16517,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-11",
-   "self_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16475,7 +16527,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-12",
-   "self_type" : "type-212",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16484,8 +16536,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16493,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-296",
+   "referenced_type" : "type-22",
+   "self_type" : "type-301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16502,8 +16554,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-16",
-   "self_type" : "type-480",
+   "referenced_type" : "type-21",
+   "self_type" : "type-493",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   }
@@ -16517,14 +16569,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16536,17 +16588,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-431"
     }
    ],
    "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-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-320", "type-428" ],
+   "template_args" : [ "type-325", "type-439" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16556,17 +16608,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-308",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-302" ],
+   "template_args" : [ "type-307" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -16576,17 +16628,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-418" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16596,14 +16648,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16615,14 +16667,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-477"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16632,7 +16684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-308"
     }
    ],
    "fields" :
@@ -16641,20 +16693,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16666,14 +16718,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16685,14 +16737,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16704,14 +16756,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16724,14 +16776,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-33"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -16771,8 +16823,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -16782,8 +16834,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16793,8 +16845,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16826,8 +16878,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16838,17 +16890,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-430"
     }
    ],
    "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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-421" ],
+   "template_args" : [ "type-432" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16895,14 +16947,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16960,14 +17012,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-326"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-325",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16979,14 +17031,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16997,7 +17049,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "fields" :
@@ -17006,25 +17058,25 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-479"
     },
     {
      "access" : "private",
@@ -17036,19 +17088,19 @@
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-493"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-544"
     },
     {
      "access" : "private",
@@ -17060,8 +17112,8 @@
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -17151,17 +17203,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-437",
+   "self_type" : "type-437",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-261" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -17206,17 +17258,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-436",
+   "self_type" : "type-436",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-357" ],
+   "template_args" : [ "type-362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -17261,17 +17313,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-435",
+   "self_type" : "type-435",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-380" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -17316,17 +17368,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-426"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-423" ],
+   "template_args" : [ "type-434" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -17373,7 +17425,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "access" : "private",
@@ -17385,20 +17437,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -17450,14 +17502,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -17487,23 +17539,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-698"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-684"
+     "referenced_type" : "type-699"
     }
    ],
    "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-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-404" ],
+   "template_args" : [ "type-364", "type-419" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -17513,23 +17565,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-704"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-705"
     }
    ],
    "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-688",
-   "self_type" : "type-688",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-359", "type-16" ],
+   "template_args" : [ "type-364", "type-21" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -17539,23 +17591,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-380"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-381"
     }
    ],
    "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-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-377", "type-379" ],
+   "template_args" : [ "type-382", "type-384" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -17565,23 +17617,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-254"
     }
    ],
    "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-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-248", "type-249" ],
+   "template_args" : [ "type-255", "type-256" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -17591,23 +17643,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-248"
     }
    ],
    "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-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-242", "type-243" ],
+   "template_args" : [ "type-249", "type-250" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -17648,18 +17700,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-281"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -17741,14 +17793,14 @@
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -17760,13 +17812,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
@@ -17783,11 +17835,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -17795,7 +17847,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17804,17 +17856,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-102"
     }
    ],
    "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-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-96" ],
+   "template_args" : [ "type-102" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -17822,7 +17874,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17831,17 +17883,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "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-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -17849,7 +17901,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17858,17 +17910,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-188" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -17876,7 +17928,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17885,17 +17937,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "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-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-61" ],
+   "template_args" : [ "type-68" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -17903,7 +17955,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17912,17 +17964,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "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-1144",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1163",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-20" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -17930,7 +17982,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17939,17 +17991,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "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-1213",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -17957,7 +18009,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17966,17 +18018,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "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-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -17984,7 +18036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "fields" :
@@ -17993,17 +18045,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -18011,17 +18063,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -18060,34 +18112,134 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-708",
+   "self_type" : "type-708",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-697" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-711",
+   "self_type" : "type-711",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-703" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-409",
+   "self_type" : "type-409",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-379" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-665",
+   "self_type" : "type-665",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-252" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-410"
+    }
+   ],
+   "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-413",
+   "self_type" : "type-413",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-246" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-57"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -18126,8 +18278,8 @@
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -18139,14 +18291,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-924"
+     "referenced_type" : "type-946"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-923",
-   "self_type" : "type-923",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -18155,8 +18307,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -18165,8 +18317,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -18175,8 +18327,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -18212,7 +18364,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
@@ -18223,8 +18375,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -18253,16 +18405,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18271,16 +18423,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-638"
     }
    ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -18289,16 +18441,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-138"
     }
    ],
    "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-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -18307,16 +18459,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-996"
+     "referenced_type" : "type-1017"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -18326,7 +18478,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
@@ -18337,8 +18489,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1017",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -18349,16 +18501,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -18368,7 +18520,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-144"
     },
     {
      "field_name" : "_pad",
@@ -18379,8 +18531,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -18391,16 +18543,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-272" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -18410,7 +18562,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
      "field_name" : "_pad",
@@ -18421,8 +18573,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -18434,7 +18586,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-981"
+     "referenced_type" : "type-1002"
     },
     {
      "field_name" : "_pad",
@@ -18445,8 +18597,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-980",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -18458,7 +18610,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-639"
     },
     {
      "field_name" : "_pad",
@@ -18469,8 +18621,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -18481,13 +18633,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-108"
+     "referenced_type" : "type-115"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-2" ],
@@ -18500,7 +18652,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "_pad",
@@ -18511,8 +18663,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -18523,13 +18675,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-1" ],
@@ -18542,7 +18694,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-264"
     },
     {
      "field_name" : "_pad",
@@ -18553,8 +18705,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -18563,8 +18715,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -18582,14 +18734,14 @@
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -18598,11 +18750,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-998",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1019",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -18612,16 +18764,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1004"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-982",
-   "self_type" : "type-982",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -18629,7 +18781,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-365"
     }
    ],
    "fields" :
@@ -18638,7 +18790,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-359"
     },
     {
      "access" : "private",
@@ -18650,13 +18802,13 @@
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -18736,13 +18888,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -18824,19 +18976,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -18848,7 +19000,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
@@ -18860,13 +19012,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -18878,7 +19030,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
@@ -18890,13 +19042,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -18920,13 +19072,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-10" ],
@@ -18939,7 +19091,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-979"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
@@ -18951,16 +19103,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-978",
-   "self_type" : "type-978",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-982" ],
+   "template_args" : [ "type-1003" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -18970,7 +19122,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-637"
     },
     {
      "access" : "private",
@@ -18982,16 +19134,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-135" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -19001,7 +19153,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -19013,16 +19165,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "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-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -19032,7 +19184,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-995"
+     "referenced_type" : "type-1016"
     },
     {
      "access" : "private",
@@ -19044,16 +19196,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1015",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -19061,7 +19213,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-645"
     }
    ],
    "fields" :
@@ -19069,14 +19221,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-641"
     }
    ],
    "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-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -19088,7 +19240,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-114"
     },
     {
      "access" : "private",
@@ -19100,13 +19252,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-21"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-2" ],
@@ -19119,19 +19271,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -19141,10 +19293,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-161"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19153,13 +19305,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "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",
@@ -19281,10 +19433,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-423"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19293,19 +19445,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-421"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-422"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -19488,10 +19640,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -19500,19 +19652,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-483"
+     "referenced_type" : "type-494"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "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",
@@ -19648,13 +19800,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "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"
@@ -19665,13 +19817,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 12,
    "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",
@@ -19780,7 +19932,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19789,13 +19941,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-188"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "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",
@@ -19917,7 +20069,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -19926,13 +20078,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-68"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "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",
@@ -20054,10 +20206,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20066,19 +20218,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-193"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "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",
@@ -20285,10 +20437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-184"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20297,19 +20449,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "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",
@@ -20495,10 +20647,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20507,19 +20659,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-922",
-   "self_type" : "type-922",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "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",
@@ -20668,10 +20820,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-70"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -20680,19 +20832,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-67"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1083",
    "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",
@@ -20820,13 +20972,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "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",
@@ -20968,12 +21120,12 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "pid",
@@ -20983,18 +21135,18 @@
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-127"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-147"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "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"
@@ -21004,13 +21156,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "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",
@@ -21123,7 +21275,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21132,13 +21284,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -21260,10 +21412,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21272,19 +21424,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "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",
@@ -21494,10 +21646,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -21506,19 +21658,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "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",
@@ -21670,13 +21822,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-30"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "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",
@@ -21821,7 +21973,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21830,13 +21982,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-75"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "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",
@@ -21958,7 +22110,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-160"
     }
    ],
    "fields" :
@@ -21967,13 +22119,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-49"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "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",
@@ -22095,10 +22247,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22107,19 +22259,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-211"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "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",
@@ -22305,10 +22457,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22317,19 +22469,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-53"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "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",
@@ -22554,10 +22706,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-77"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22566,19 +22718,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "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",
@@ -22706,10 +22858,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-56"
     }
    ],
    "fields" :
@@ -22718,19 +22870,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-48"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-923"
+     "referenced_type" : "type-945"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "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",
@@ -22897,13 +23049,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-31"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "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",
@@ -23016,13 +23168,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "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",
@@ -23189,17 +23341,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-545"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-534" ],
+   "template_args" : [ "type-546" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -23209,17 +23361,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-503" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -23229,17 +23381,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-952" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -23249,17 +23401,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-440"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-431" ],
+   "template_args" : [ "type-442" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -23269,17 +23421,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-957"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-935",
-   "self_type" : "type-935",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-938" ],
+   "template_args" : [ "type-959" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -23289,17 +23441,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -23309,17 +23461,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -23329,17 +23481,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-617"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-610" ],
+   "template_args" : [ "type-622" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -23349,157 +23501,157 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
-   "name" : "android::sp<android::hardware::details::Waiter>",
-   "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-361"
-    }
-   ],
-   "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-917",
-   "self_type" : "type-917",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-353" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
-   "name" : "android::sp<android::hardware::hidl_death_recipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-356" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
-    }
-   ],
-   "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-85",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-24" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-182"
-    }
-   ],
-   "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-181",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
-    }
-   ],
-   "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-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
-    }
-   ],
-   "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-20",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-71"
     }
    ],
+   "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
+   "name" : "android::sp<android::hardware::details::Waiter>",
+   "record_kind" : "class",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-81" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-366"
+    }
+   ],
+   "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-937",
+   "self_type" : "type-937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-358" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-360"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
+   "name" : "android::sp<android::hardware::hidl_death_recipient>",
+   "record_kind" : "class",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-361" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-95"
+    }
+   ],
+   "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-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-31" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-189"
+    }
+   ],
+   "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-188",
+   "self_type" : "type-188",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-30" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-69"
+    }
+   ],
+   "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-68",
+   "self_type" : "type-68",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-70" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "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-27",
+   "self_type" : "type-27",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-29" ],
+   "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-76"
+    }
+   ],
    "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-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -23509,69 +23661,69 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-50"
     }
    ],
    "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-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23581,52 +23733,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23636,8 +23788,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23647,85 +23799,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-550",
+   "self_type" : "type-550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23735,52 +23887,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23790,8 +23942,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-731",
+   "self_type" : "type-731",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23801,85 +23953,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -23889,52 +24041,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-686",
+   "self_type" : "type-686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -23944,8 +24096,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-732",
+   "self_type" : "type-732",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -23955,107 +24107,107 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-320" ],
+   "template_args" : [ "type-325" ],
    "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-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-312" ],
+   "template_args" : [ "type-317" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-562",
+   "self_type" : "type-562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-21" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-62" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -24065,52 +24217,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-178" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-668" ],
+   "template_args" : [ "type-682" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-145" ],
+   "template_args" : [ "type-149" ],
    "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-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-103" ],
    "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-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-11" ],
@@ -24120,8 +24272,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-734",
+   "self_type" : "type-734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-12" ],
@@ -24131,33 +24283,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-681" ],
+   "template_args" : [ "type-695" ],
    "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-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-650",
+   "self_type" : "type-650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -24167,23 +24319,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-385"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-387" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -24193,23 +24345,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-931"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-930",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-914" ],
+   "template_args" : [ "type-934" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -24219,23 +24371,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-360"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-356" ],
+   "template_args" : [ "type-361" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -24245,23 +24397,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-24" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -24270,18 +24422,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -24297,18 +24449,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-466"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -24319,7 +24471,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-462"
     },
     {
      "field_name" : "num_planes",
@@ -24329,13 +24481,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-453"
+     "referenced_type" : "type-464"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -24346,12 +24498,12 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-461"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-459"
     },
     {
      "field_name" : "bits_per_component",
@@ -24386,8 +24538,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-460",
+   "self_type" : "type-460",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -24398,38 +24550,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-467"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -24440,18 +24592,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -24462,17 +24614,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-427"
     },
     {
      "field_name" : "ystride",
@@ -24492,13 +24644,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-458"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -24508,13 +24660,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -24525,35 +24677,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-350"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-347"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-345"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-344"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-342"
     }
    ],
    "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-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "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)"
@@ -24574,8 +24726,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -24586,12 +24738,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24616,13 +24768,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-342",
+   "self_type" : "type-342",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -24633,12 +24785,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24668,13 +24820,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -24685,12 +24837,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24720,13 +24872,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -24737,12 +24889,12 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "pid",
@@ -24777,13 +24929,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -24827,8 +24979,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-95",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24836,8 +24988,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-84",
-   "self_type" : "type-88",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24845,8 +24997,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-954",
-   "self_type" : "type-957",
+   "referenced_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24854,8 +25006,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-1073",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24863,8 +25015,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-1144",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24872,8 +25024,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-1213",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24881,8 +25033,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-1291",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24890,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-148",
-   "self_type" : "type-283",
+   "referenced_type" : "type-151",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24899,8 +25051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-14",
-   "self_type" : "type-394",
+   "referenced_type" : "type-19",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24909,7 +25061,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-5",
-   "self_type" : "type-707",
+   "self_type" : "type-723",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24917,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-404",
-   "self_type" : "type-687",
+   "referenced_type" : "type-419",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -24926,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-324",
+   "referenced_type" : "type-20",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24935,8 +25087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-268",
-   "self_type" : "type-278",
+   "referenced_type" : "type-273",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24944,8 +25096,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-276",
-   "self_type" : "type-282",
+   "referenced_type" : "type-281",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24953,8 +25105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24962,8 +25114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-502",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24971,8 +25123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-428",
-   "self_type" : "type-515",
+   "referenced_type" : "type-439",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24980,8 +25132,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-917",
-   "self_type" : "type-949",
+   "referenced_type" : "type-937",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24989,8 +25141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-507",
+   "referenced_type" : "type-505",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24998,8 +25150,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-85",
-   "self_type" : "type-592",
+   "referenced_type" : "type-94",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25007,8 +25159,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-181",
-   "self_type" : "type-942",
+   "referenced_type" : "type-188",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25016,8 +25168,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-61",
-   "self_type" : "type-946",
+   "referenced_type" : "type-68",
+   "self_type" : "type-969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25025,8 +25177,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-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25034,8 +25186,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-70",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-75",
+   "self_type" : "type-1231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25043,8 +25195,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-42",
-   "self_type" : "type-224",
+   "referenced_type" : "type-49",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25052,8 +25204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-379",
-   "self_type" : "type-389",
+   "referenced_type" : "type-384",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25061,8 +25213,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-359",
-   "self_type" : "type-686",
+   "referenced_type" : "type-364",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25070,8 +25222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-377",
-   "self_type" : "type-388",
+   "referenced_type" : "type-382",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25079,8 +25231,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-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25088,8 +25240,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-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25097,8 +25249,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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25106,8 +25258,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-1244",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25115,8 +25267,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-1325",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25124,8 +25276,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-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25133,8 +25285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25142,8 +25294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25151,8 +25303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25160,8 +25312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25169,8 +25321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25178,8 +25330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25187,8 +25339,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25196,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25205,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25214,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25223,8 +25375,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -25232,8 +25384,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }